From 9bfe7ad92d20f2a84220d431b48437268a9f23d0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 15 Dec 2003 11:42:03 +0000 Subject: [PATCH] regenerated makefiles git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 2660 ++++++++++---------- build/msw/wx_adv.dsp | 32 +- build/msw/wx_base.dsp | 32 +- build/msw/wx_core.dsp | 32 +- build/msw/wx_dbgrid.dsp | 32 +- build/msw/wx_gl.dsp | 32 +- build/msw/wx_html.dsp | 32 +- build/msw/wx_net.dsp | 32 +- build/msw/wx_odbc.dsp | 32 +- build/msw/wx_xml.dsp | 32 +- contrib/build/animate/makefile.bcc | 35 +- contrib/build/animate/makefile.gcc | 10 +- contrib/build/animate/makefile.vc | 17 +- contrib/build/animate/makefile.wat | 24 +- contrib/build/deprecated/makefile.bcc | 57 +- contrib/build/deprecated/makefile.gcc | 33 +- contrib/build/deprecated/makefile.vc | 31 +- contrib/build/deprecated/makefile.wat | 35 +- contrib/build/fl/makefile.bcc | 33 +- contrib/build/fl/makefile.gcc | 20 +- contrib/build/fl/makefile.vc | 12 +- contrib/build/fl/makefile.wat | 22 +- contrib/build/gizmos/makefile.bcc | 35 +- contrib/build/gizmos/makefile.gcc | 10 +- contrib/build/gizmos/makefile.vc | 16 +- contrib/build/gizmos/makefile.wat | 21 +- contrib/build/mmedia/makefile.bcc | 35 +- contrib/build/mmedia/makefile.gcc | 10 +- contrib/build/mmedia/makefile.vc | 16 +- contrib/build/mmedia/makefile.wat | 21 +- contrib/build/net/makefile.bcc | 33 +- contrib/build/net/makefile.gcc | 10 +- contrib/build/net/makefile.vc | 17 +- contrib/build/net/makefile.wat | 17 +- contrib/build/ogl/makefile.bcc | 33 +- contrib/build/ogl/makefile.gcc | 20 +- contrib/build/ogl/makefile.vc | 12 +- contrib/build/ogl/makefile.wat | 22 +- contrib/build/plot/makefile.bcc | 35 +- contrib/build/plot/makefile.gcc | 20 +- contrib/build/plot/makefile.vc | 12 +- contrib/build/plot/makefile.wat | 22 +- contrib/build/stc/makefile.bcc | 37 +- contrib/build/stc/makefile.gcc | 20 +- contrib/build/stc/makefile.vc | 12 +- contrib/build/stc/makefile.wat | 18 +- contrib/build/svg/makefile.bcc | 33 +- contrib/build/svg/makefile.gcc | 20 +- contrib/build/svg/makefile.vc | 12 +- contrib/build/svg/makefile.wat | 22 +- contrib/build/xrc/makefile.bcc | 35 +- contrib/build/xrc/makefile.gcc | 20 +- contrib/build/xrc/makefile.vc | 12 +- contrib/build/xrc/makefile.wat | 22 +- contrib/samples/animate/Makefile.in | 16 +- contrib/samples/animate/makefile.bcc | 17 +- contrib/samples/animate/makefile.gcc | 6 +- contrib/samples/animate/makefile.vc | 7 +- contrib/samples/animate/makefile.wat | 10 +- contrib/samples/deprecated/proplist/Makefile.in | 17 +- contrib/samples/deprecated/proplist/makefile.bcc | 17 +- contrib/samples/deprecated/proplist/makefile.gcc | 6 +- contrib/samples/deprecated/proplist/makefile.vc | 8 +- contrib/samples/deprecated/proplist/makefile.wat | 6 +- contrib/samples/deprecated/resource/Makefile.in | 17 +- contrib/samples/deprecated/resource/makefile.bcc | 17 +- contrib/samples/deprecated/resource/makefile.gcc | 6 +- contrib/samples/deprecated/resource/makefile.vc | 8 +- contrib/samples/deprecated/resource/makefile.wat | 6 +- contrib/samples/deprecated/treelay/Makefile.in | 17 +- contrib/samples/deprecated/treelay/makefile.bcc | 17 +- contrib/samples/deprecated/treelay/makefile.gcc | 6 +- contrib/samples/deprecated/treelay/makefile.vc | 8 +- contrib/samples/deprecated/treelay/makefile.wat | 10 +- contrib/samples/fl/Makefile.in | 75 +- contrib/samples/fl/makefile.bcc | 69 +- contrib/samples/fl/makefile.gcc | 30 +- contrib/samples/fl/makefile.vc | 38 +- contrib/samples/fl/makefile.wat | 50 +- contrib/samples/gizmos/dynsash/Makefile.in | 17 +- contrib/samples/gizmos/dynsash/makefile.bcc | 17 +- contrib/samples/gizmos/dynsash/makefile.gcc | 6 +- contrib/samples/gizmos/dynsash/makefile.vc | 8 +- contrib/samples/gizmos/dynsash/makefile.wat | 10 +- contrib/samples/gizmos/dynsash_switch/Makefile.in | 17 +- contrib/samples/gizmos/dynsash_switch/makefile.bcc | 15 +- contrib/samples/gizmos/dynsash_switch/makefile.gcc | 11 +- contrib/samples/gizmos/dynsash_switch/makefile.vc | 14 +- contrib/samples/gizmos/dynsash_switch/makefile.wat | 6 +- contrib/samples/gizmos/editlbox/Makefile.in | 16 +- contrib/samples/gizmos/editlbox/makefile.bcc | 17 +- contrib/samples/gizmos/editlbox/makefile.gcc | 10 +- contrib/samples/gizmos/editlbox/makefile.vc | 6 +- contrib/samples/gizmos/editlbox/makefile.wat | 10 +- contrib/samples/gizmos/led/Makefile.in | 13 +- contrib/samples/gizmos/led/makefile.bcc | 17 +- contrib/samples/gizmos/led/makefile.gcc | 10 +- contrib/samples/gizmos/led/makefile.vc | 6 +- contrib/samples/gizmos/led/makefile.wat | 10 +- contrib/samples/gizmos/multicell/Makefile.in | 16 +- contrib/samples/gizmos/multicell/makefile.bcc | 17 +- contrib/samples/gizmos/multicell/makefile.gcc | 10 +- contrib/samples/gizmos/multicell/makefile.vc | 6 +- contrib/samples/gizmos/multicell/makefile.wat | 10 +- contrib/samples/gizmos/splittree/Makefile.in | 17 +- contrib/samples/gizmos/splittree/makefile.bcc | 17 +- contrib/samples/gizmos/splittree/makefile.gcc | 6 +- contrib/samples/gizmos/splittree/makefile.vc | 8 +- contrib/samples/gizmos/splittree/makefile.wat | 6 +- contrib/samples/mmedia/Makefile.in | 16 +- contrib/samples/mmedia/makefile.bcc | 17 +- contrib/samples/mmedia/makefile.gcc | 6 +- contrib/samples/mmedia/makefile.vc | 7 +- contrib/samples/mmedia/makefile.wat | 10 +- contrib/samples/ogl/ogledit/Makefile.in | 17 +- contrib/samples/ogl/ogledit/makefile.bcc | 17 +- contrib/samples/ogl/ogledit/makefile.gcc | 6 +- contrib/samples/ogl/ogledit/makefile.vc | 8 +- contrib/samples/ogl/ogledit/makefile.wat | 10 +- contrib/samples/ogl/studio/Makefile.in | 16 +- contrib/samples/ogl/studio/makefile.bcc | 17 +- contrib/samples/ogl/studio/makefile.gcc | 6 +- contrib/samples/ogl/studio/makefile.vc | 6 +- contrib/samples/ogl/studio/makefile.wat | 10 +- contrib/samples/plot/Makefile.in | 15 +- contrib/samples/plot/makefile.bcc | 17 +- contrib/samples/plot/makefile.gcc | 10 +- contrib/samples/plot/makefile.vc | 5 +- contrib/samples/plot/makefile.wat | 10 +- contrib/samples/stc/Makefile.in | 16 +- contrib/samples/stc/makefile.bcc | 17 +- contrib/samples/stc/makefile.gcc | 6 +- contrib/samples/stc/makefile.vc | 7 +- contrib/samples/stc/makefile.wat | 10 +- contrib/samples/svg/Makefile.in | 16 +- contrib/samples/svg/makefile.bcc | 17 +- contrib/samples/svg/makefile.gcc | 6 +- contrib/samples/svg/makefile.vc | 7 +- contrib/samples/svg/makefile.wat | 10 +- contrib/samples/xrc/Makefile.in | 16 +- contrib/samples/xrc/makefile.bcc | 17 +- contrib/samples/xrc/makefile.gcc | 6 +- contrib/samples/xrc/makefile.vc | 7 +- contrib/samples/xrc/makefile.wat | 10 +- contrib/src/animate/Makefile.in | 25 +- contrib/src/deprecated/Makefile.in | 66 +- contrib/src/fl/Makefile.in | 86 +- contrib/src/gizmos/Makefile.in | 43 +- contrib/src/mmedia/Makefile.in | 115 +- contrib/src/net/Makefile.in | 33 +- contrib/src/ogl/Makefile.in | 66 +- contrib/src/plot/Makefile.in | 23 +- contrib/src/stc/Makefile.in | 13 +- contrib/src/svg/Makefile.in | 22 +- contrib/src/xrc/Makefile.in | 168 +- contrib/utils/convertrc/Makefile.in | 16 +- contrib/utils/convertrc/makefile.bcc | 17 +- contrib/utils/convertrc/makefile.gcc | 6 +- contrib/utils/convertrc/makefile.vc | 7 +- contrib/utils/convertrc/makefile.wat | 6 +- contrib/utils/wxrc/Makefile.in | 4 +- contrib/utils/wxrc/makefile.bcc | 17 +- contrib/utils/wxrc/makefile.gcc | 8 +- contrib/utils/wxrc/makefile.vc | 6 +- contrib/utils/wxrc/makefile.wat | 8 +- contrib/utils/wxrcedit/Makefile.in | 16 +- contrib/utils/wxrcedit/makefile.bcc | 17 +- contrib/utils/wxrcedit/makefile.gcc | 6 +- contrib/utils/wxrcedit/makefile.vc | 7 +- contrib/utils/wxrcedit/makefile.wat | 6 +- demos/bombs/Makefile.in | 11 +- demos/bombs/makefile.bcc | 17 +- demos/bombs/makefile.gcc | 9 +- demos/bombs/makefile.vc | 6 +- demos/bombs/makefile.wat | 8 +- demos/dbbrowse/Makefile.in | 11 +- demos/dbbrowse/makefile.bcc | 17 +- demos/dbbrowse/makefile.gcc | 6 +- demos/dbbrowse/makefile.vc | 8 +- demos/dbbrowse/makefile.wat | 4 +- demos/forty/Makefile.in | 11 +- demos/forty/makefile.bcc | 17 +- demos/forty/makefile.gcc | 9 +- demos/forty/makefile.vc | 6 +- demos/forty/makefile.wat | 8 +- demos/fractal/Makefile.in | 11 +- demos/fractal/makefile.bcc | 17 +- demos/fractal/makefile.gcc | 6 +- demos/fractal/makefile.vc | 8 +- demos/fractal/makefile.wat | 8 +- demos/life/Makefile.in | 11 +- demos/life/makefile.bcc | 7 +- demos/makefile.bcc | 9 +- demos/poem/Makefile.in | 11 +- demos/poem/makefile.bcc | 17 +- demos/poem/makefile.gcc | 6 +- demos/poem/makefile.vc | 6 +- demos/poem/makefile.wat | 8 +- samples/access/Makefile.in | 11 +- samples/access/makefile.bcc | 17 +- samples/access/makefile.gcc | 10 +- samples/access/makefile.vc | 8 +- samples/access/makefile.wat | 4 +- samples/artprov/Makefile.in | 11 +- samples/artprov/makefile.bcc | 17 +- samples/artprov/makefile.gcc | 6 +- samples/artprov/makefile.vc | 8 +- samples/artprov/makefile.wat | 8 +- samples/calendar/Makefile.in | 11 +- samples/calendar/makefile.bcc | 17 +- samples/calendar/makefile.gcc | 6 +- samples/calendar/makefile.vc | 8 +- samples/calendar/makefile.wat | 4 +- samples/caret/Makefile.in | 11 +- samples/caret/makefile.bcc | 17 +- samples/caret/makefile.gcc | 9 +- samples/caret/makefile.vc | 6 +- samples/caret/makefile.wat | 8 +- samples/checklst/Makefile.in | 11 +- samples/checklst/makefile.bcc | 17 +- samples/checklst/makefile.gcc | 6 +- samples/checklst/makefile.vc | 8 +- samples/checklst/makefile.wat | 4 +- samples/config/Makefile.in | 11 +- samples/config/makefile.bcc | 17 +- samples/config/makefile.gcc | 6 +- samples/config/makefile.vc | 8 +- samples/config/makefile.wat | 4 +- samples/console/Makefile.in | 4 +- samples/controls/Makefile.in | 11 +- samples/controls/makefile.bcc | 17 +- samples/controls/makefile.gcc | 6 +- samples/controls/makefile.vc | 8 +- samples/controls/makefile.wat | 4 +- samples/db/Makefile.in | 11 +- samples/db/makefile.bcc | 17 +- samples/db/makefile.gcc | 6 +- samples/db/makefile.vc | 6 +- samples/db/makefile.wat | 8 +- samples/dialogs/Makefile.in | 11 +- samples/dialogs/makefile.bcc | 17 +- samples/dialogs/makefile.gcc | 6 +- samples/dialogs/makefile.vc | 8 +- samples/dialogs/makefile.wat | 8 +- samples/dialup/Makefile.in | 11 +- samples/dialup/makefile.bcc | 17 +- samples/dialup/makefile.gcc | 6 +- samples/dialup/makefile.vc | 8 +- samples/dialup/makefile.wat | 8 +- samples/display/Makefile.in | 11 +- samples/display/makefile.bcc | 17 +- samples/display/makefile.gcc | 6 +- samples/display/makefile.vc | 8 +- samples/display/makefile.wat | 8 +- samples/dnd/Makefile.in | 10 +- samples/dnd/makefile.bcc | 17 +- samples/dnd/makefile.gcc | 9 +- samples/dnd/makefile.vc | 6 +- samples/dnd/makefile.wat | 8 +- samples/docview/Makefile.in | 13 +- samples/docview/makefile.bcc | 17 +- samples/docview/makefile.gcc | 6 +- samples/docview/makefile.vc | 8 +- samples/docview/makefile.wat | 8 +- samples/docvwmdi/Makefile.in | 11 +- samples/docvwmdi/makefile.bcc | 17 +- samples/docvwmdi/makefile.gcc | 6 +- samples/docvwmdi/makefile.vc | 8 +- samples/docvwmdi/makefile.wat | 8 +- samples/dragimag/Makefile.in | 11 +- samples/dragimag/makefile.bcc | 17 +- samples/dragimag/makefile.gcc | 6 +- samples/dragimag/makefile.vc | 8 +- samples/dragimag/makefile.wat | 4 +- samples/drawing/Makefile.in | 11 +- samples/drawing/makefile.bcc | 17 +- samples/drawing/makefile.gcc | 6 +- samples/drawing/makefile.vc | 8 +- samples/drawing/makefile.wat | 8 +- samples/dynamic/Makefile.in | 11 +- samples/dynamic/makefile.bcc | 17 +- samples/dynamic/makefile.gcc | 6 +- samples/dynamic/makefile.vc | 8 +- samples/dynamic/makefile.wat | 8 +- samples/erase/Makefile.in | 11 +- samples/erase/makefile.bcc | 17 +- samples/erase/makefile.gcc | 9 +- samples/erase/makefile.vc | 6 +- samples/erase/makefile.wat | 8 +- samples/event/Makefile.in | 11 +- samples/event/makefile.bcc | 17 +- samples/event/makefile.gcc | 9 +- samples/event/makefile.vc | 6 +- samples/event/makefile.wat | 8 +- samples/except/Makefile.in | 11 +- samples/except/makefile.bcc | 17 +- samples/except/makefile.gcc | 6 +- samples/except/makefile.vc | 6 +- samples/except/makefile.wat | 8 +- samples/exec/Makefile.in | 11 +- samples/exec/makefile.bcc | 17 +- samples/exec/makefile.gcc | 9 +- samples/exec/makefile.vc | 6 +- samples/exec/makefile.wat | 8 +- samples/font/Makefile.in | 11 +- samples/font/makefile.bcc | 17 +- samples/font/makefile.gcc | 9 +- samples/font/makefile.vc | 6 +- samples/font/makefile.wat | 8 +- samples/grid/Makefile.in | 11 +- samples/grid/makefile.bcc | 17 +- samples/grid/makefile.gcc | 9 +- samples/grid/makefile.vc | 6 +- samples/grid/makefile.wat | 8 +- samples/help/Makefile.in | 11 +- samples/help/makefile.bcc | 17 +- samples/help/makefile.gcc | 9 +- samples/help/makefile.vc | 6 +- samples/help/makefile.wat | 8 +- samples/htlbox/Makefile.in | 11 +- samples/htlbox/makefile.bcc | 17 +- samples/htlbox/makefile.gcc | 6 +- samples/htlbox/makefile.vc | 6 +- samples/htlbox/makefile.wat | 8 +- samples/html/about/Makefile.in | 11 +- samples/html/about/makefile.bcc | 18 +- samples/html/about/makefile.gcc | 10 +- samples/html/about/makefile.vc | 4 +- samples/html/about/makefile.wat | 8 +- samples/html/help/Makefile.in | 11 +- samples/html/help/makefile.bcc | 18 +- samples/html/help/makefile.gcc | 10 +- samples/html/help/makefile.vc | 4 +- samples/html/help/makefile.wat | 8 +- samples/html/helpview/Makefile.in | 11 +- samples/html/helpview/makefile.bcc | 18 +- samples/html/helpview/makefile.gcc | 6 +- samples/html/helpview/makefile.vc | 6 +- samples/html/helpview/makefile.wat | 5 +- samples/html/makefile.bcc | 9 +- samples/html/printing/Makefile.in | 11 +- samples/html/printing/makefile.bcc | 18 +- samples/html/printing/makefile.gcc | 6 +- samples/html/printing/makefile.vc | 6 +- samples/html/printing/makefile.wat | 5 +- samples/html/test/Makefile.in | 11 +- samples/html/test/makefile.bcc | 18 +- samples/html/test/makefile.gcc | 10 +- samples/html/test/makefile.vc | 4 +- samples/html/test/makefile.wat | 8 +- samples/html/virtual/Makefile.in | 11 +- samples/html/virtual/makefile.bcc | 18 +- samples/html/virtual/makefile.gcc | 6 +- samples/html/virtual/makefile.vc | 6 +- samples/html/virtual/makefile.wat | 8 +- samples/html/widget/Makefile.in | 11 +- samples/html/widget/makefile.bcc | 18 +- samples/html/widget/makefile.gcc | 6 +- samples/html/widget/makefile.vc | 4 +- samples/html/widget/makefile.wat | 8 +- samples/html/zip/Makefile.in | 11 +- samples/html/zip/makefile.bcc | 18 +- samples/html/zip/makefile.gcc | 10 +- samples/html/zip/makefile.vc | 4 +- samples/html/zip/makefile.wat | 8 +- samples/image/Makefile.in | 11 +- samples/image/makefile.bcc | 17 +- samples/image/makefile.gcc | 9 +- samples/image/makefile.vc | 6 +- samples/image/makefile.wat | 8 +- samples/internat/Makefile.in | 11 +- samples/internat/makefile.bcc | 17 +- samples/internat/makefile.gcc | 6 +- samples/internat/makefile.vc | 8 +- samples/internat/makefile.wat | 4 +- samples/ipc/Makefile.in | 22 +- samples/ipc/makefile.bcc | 29 +- samples/ipc/makefile.gcc | 18 +- samples/ipc/makefile.vc | 12 +- samples/ipc/makefile.wat | 16 +- samples/joytest/Makefile.in | 11 +- samples/joytest/makefile.bcc | 17 +- samples/joytest/makefile.gcc | 6 +- samples/joytest/makefile.vc | 8 +- samples/joytest/makefile.wat | 8 +- samples/keyboard/Makefile.in | 11 +- samples/keyboard/makefile.bcc | 17 +- samples/keyboard/makefile.gcc | 6 +- samples/keyboard/makefile.vc | 8 +- samples/keyboard/makefile.wat | 4 +- samples/layout/Makefile.in | 11 +- samples/layout/makefile.bcc | 17 +- samples/layout/makefile.gcc | 6 +- samples/layout/makefile.vc | 6 +- samples/layout/makefile.wat | 8 +- samples/listbox/Makefile.in | 11 +- samples/listbox/makefile.bcc | 17 +- samples/listbox/makefile.gcc | 6 +- samples/listbox/makefile.vc | 8 +- samples/listbox/makefile.wat | 8 +- samples/listctrl/Makefile.in | 11 +- samples/listctrl/makefile.bcc | 17 +- samples/listctrl/makefile.gcc | 6 +- samples/listctrl/makefile.vc | 8 +- samples/listctrl/makefile.wat | 4 +- samples/makefile.bcc | 9 +- samples/mdi/Makefile.in | 10 +- samples/mdi/makefile.bcc | 17 +- samples/mdi/makefile.gcc | 9 +- samples/mdi/makefile.vc | 6 +- samples/mdi/makefile.wat | 8 +- samples/memcheck/Makefile.in | 11 +- samples/memcheck/makefile.bcc | 17 +- samples/memcheck/makefile.gcc | 6 +- samples/memcheck/makefile.vc | 8 +- samples/memcheck/makefile.wat | 4 +- samples/menu/Makefile.in | 11 +- samples/menu/makefile.bcc | 17 +- samples/menu/makefile.gcc | 9 +- samples/menu/makefile.vc | 6 +- samples/menu/makefile.wat | 8 +- samples/mfc/Makefile.in | 11 +- samples/mfc/makefile.bcc | 17 +- samples/mfc/makefile.gcc | 6 +- samples/mfc/makefile.vc | 8 +- samples/mfc/makefile.wat | 8 +- samples/minifram/Makefile.in | 11 +- samples/minifram/makefile.bcc | 17 +- samples/minifram/makefile.gcc | 6 +- samples/minifram/makefile.vc | 8 +- samples/minifram/makefile.wat | 4 +- samples/minimal/Makefile.in | 11 +- samples/minimal/makefile.bcc | 17 +- samples/minimal/makefile.gcc | 6 +- samples/minimal/makefile.vc | 8 +- samples/minimal/makefile.wat | 8 +- samples/mobile/makefile.bcc | 9 +- samples/mobile/styles/Makefile.in | 11 +- samples/mobile/styles/makefile.bcc | 18 +- samples/mobile/styles/makefile.gcc | 6 +- samples/mobile/styles/makefile.vc | 4 +- samples/mobile/styles/makefile.wat | 8 +- samples/mobile/wxedit/Makefile.in | 11 +- samples/mobile/wxedit/makefile.bcc | 18 +- samples/mobile/wxedit/makefile.gcc | 6 +- samples/mobile/wxedit/makefile.vc | 4 +- samples/mobile/wxedit/makefile.wat | 8 +- samples/multimon/Makefile.in | 13 +- samples/multimon/makefile.bcc | 15 +- samples/multimon/makefile.gcc | 10 +- samples/multimon/makefile.vc | 12 +- samples/multimon/makefile.wat | 4 +- samples/nativdlg/Makefile.in | 11 +- samples/nativdlg/makefile.bcc | 17 +- samples/nativdlg/makefile.gcc | 6 +- samples/nativdlg/makefile.vc | 8 +- samples/nativdlg/makefile.wat | 4 +- samples/notebook/Makefile.in | 11 +- samples/notebook/makefile.bcc | 17 +- samples/notebook/makefile.gcc | 6 +- samples/notebook/makefile.vc | 8 +- samples/notebook/makefile.wat | 4 +- samples/oleauto/Makefile.in | 11 +- samples/oleauto/makefile.bcc | 17 +- samples/oleauto/makefile.gcc | 6 +- samples/oleauto/makefile.vc | 8 +- samples/oleauto/makefile.wat | 8 +- samples/opengl/cube/Makefile.in | 11 +- samples/opengl/cube/makefile.bcc | 18 +- samples/opengl/cube/makefile.gcc | 10 +- samples/opengl/cube/makefile.vc | 4 +- samples/opengl/cube/makefile.wat | 8 +- samples/opengl/isosurf/Makefile.in | 11 +- samples/opengl/isosurf/makefile.bcc | 18 +- samples/opengl/isosurf/makefile.gcc | 6 +- samples/opengl/isosurf/makefile.vc | 6 +- samples/opengl/isosurf/makefile.wat | 8 +- samples/opengl/makefile.bcc | 9 +- samples/opengl/penguin/Makefile.in | 16 +- samples/opengl/penguin/makefile.bcc | 24 +- samples/opengl/penguin/makefile.gcc | 14 +- samples/opengl/penguin/makefile.vc | 10 +- samples/opengl/penguin/makefile.wat | 16 +- samples/ownerdrw/Makefile.in | 11 +- samples/ownerdrw/makefile.bcc | 17 +- samples/ownerdrw/makefile.gcc | 6 +- samples/ownerdrw/makefile.vc | 8 +- samples/ownerdrw/makefile.wat | 4 +- samples/png/Makefile.in | 10 +- samples/png/makefile.bcc | 17 +- samples/png/makefile.gcc | 9 +- samples/png/makefile.vc | 6 +- samples/png/makefile.wat | 8 +- samples/printing/Makefile.in | 11 +- samples/printing/makefile.bcc | 17 +- samples/printing/makefile.gcc | 6 +- samples/printing/makefile.vc | 8 +- samples/printing/makefile.wat | 4 +- samples/propsize/Makefile.in | 11 +- samples/propsize/makefile.bcc | 17 +- samples/propsize/makefile.gcc | 6 +- samples/propsize/makefile.vc | 8 +- samples/propsize/makefile.wat | 4 +- samples/regtest/Makefile.in | 11 +- samples/regtest/makefile.bcc | 17 +- samples/regtest/makefile.gcc | 6 +- samples/regtest/makefile.vc | 8 +- samples/regtest/makefile.wat | 8 +- samples/render/Makefile.in | 15 +- samples/render/makefile.bcc | 29 +- samples/render/makefile.gcc | 17 +- samples/render/makefile.vc | 12 +- samples/render/makefile.wat | 16 +- samples/richedit/Makefile.in | 11 +- samples/richedit/makefile.bcc | 17 +- samples/richedit/makefile.gcc | 6 +- samples/richedit/makefile.vc | 8 +- samples/richedit/makefile.wat | 4 +- samples/rotate/Makefile.in | 11 +- samples/rotate/makefile.bcc | 17 +- samples/rotate/makefile.gcc | 6 +- samples/rotate/makefile.vc | 6 +- samples/rotate/makefile.wat | 8 +- samples/sashtest/Makefile.in | 11 +- samples/sashtest/makefile.bcc | 17 +- samples/sashtest/makefile.gcc | 6 +- samples/sashtest/makefile.vc | 8 +- samples/sashtest/makefile.wat | 4 +- samples/scroll/Makefile.in | 11 +- samples/scroll/makefile.bcc | 17 +- samples/scroll/makefile.gcc | 6 +- samples/scroll/makefile.vc | 6 +- samples/scroll/makefile.wat | 8 +- samples/scrollsub/Makefile.in | 11 +- samples/scrollsub/makefile.bcc | 17 +- samples/scrollsub/makefile.gcc | 6 +- samples/scrollsub/makefile.vc | 8 +- samples/scrollsub/makefile.wat | 4 +- samples/shaped/Makefile.in | 11 +- samples/shaped/makefile.bcc | 17 +- samples/shaped/makefile.gcc | 6 +- samples/shaped/makefile.vc | 6 +- samples/shaped/makefile.wat | 8 +- samples/sockets/Makefile.in | 22 +- samples/sockets/makefile.bcc | 29 +- samples/sockets/makefile.gcc | 18 +- samples/sockets/makefile.vc | 12 +- samples/sockets/makefile.wat | 16 +- samples/splitter/Makefile.in | 11 +- samples/splitter/makefile.bcc | 17 +- samples/splitter/makefile.gcc | 6 +- samples/splitter/makefile.vc | 8 +- samples/splitter/makefile.wat | 4 +- samples/statbar/Makefile.in | 11 +- samples/statbar/makefile.bcc | 17 +- samples/statbar/makefile.gcc | 6 +- samples/statbar/makefile.vc | 8 +- samples/statbar/makefile.wat | 8 +- samples/stc/Makefile.in | 16 +- samples/stc/makefile.bcc | 17 +- samples/stc/makefile.gcc | 6 +- samples/stc/makefile.vc | 7 +- samples/stc/makefile.wat | 10 +- samples/svg/Makefile.in | 16 +- samples/svg/makefile.bcc | 17 +- samples/svg/makefile.gcc | 6 +- samples/svg/makefile.vc | 7 +- samples/svg/makefile.wat | 10 +- samples/tab/Makefile.in | 10 +- samples/tab/makefile.bcc | 17 +- samples/tab/makefile.gcc | 9 +- samples/tab/makefile.vc | 6 +- samples/tab/makefile.wat | 8 +- samples/taskbar/Makefile.in | 11 +- samples/taskbar/makefile.bcc | 17 +- samples/taskbar/makefile.gcc | 6 +- samples/taskbar/makefile.vc | 8 +- samples/taskbar/makefile.wat | 8 +- samples/text/Makefile.in | 11 +- samples/text/makefile.bcc | 17 +- samples/text/makefile.gcc | 9 +- samples/text/makefile.vc | 6 +- samples/text/makefile.wat | 8 +- samples/thread/Makefile.in | 11 +- samples/thread/makefile.bcc | 17 +- samples/thread/makefile.gcc | 6 +- samples/thread/makefile.vc | 6 +- samples/thread/makefile.wat | 8 +- samples/toolbar/Makefile.in | 11 +- samples/toolbar/makefile.bcc | 17 +- samples/toolbar/makefile.gcc | 6 +- samples/toolbar/makefile.vc | 8 +- samples/toolbar/makefile.wat | 8 +- samples/treectrl/Makefile.in | 11 +- samples/treectrl/makefile.bcc | 17 +- samples/treectrl/makefile.gcc | 6 +- samples/treectrl/makefile.vc | 8 +- samples/treectrl/makefile.wat | 4 +- samples/typetest/Makefile.in | 11 +- samples/typetest/makefile.bcc | 17 +- samples/typetest/makefile.gcc | 6 +- samples/typetest/makefile.vc | 8 +- samples/typetest/makefile.wat | 4 +- samples/validate/Makefile.in | 11 +- samples/validate/makefile.bcc | 17 +- samples/validate/makefile.gcc | 6 +- samples/validate/makefile.vc | 8 +- samples/validate/makefile.wat | 4 +- samples/vscroll/Makefile.in | 11 +- samples/vscroll/makefile.bcc | 17 +- samples/vscroll/makefile.gcc | 6 +- samples/vscroll/makefile.vc | 6 +- samples/vscroll/makefile.wat | 8 +- samples/widgets/Makefile.in | 11 +- samples/widgets/makefile.bcc | 17 +- samples/widgets/makefile.gcc | 6 +- samples/widgets/makefile.vc | 8 +- samples/widgets/makefile.wat | 8 +- samples/wizard/Makefile.in | 11 +- samples/wizard/makefile.bcc | 17 +- samples/wizard/makefile.gcc | 6 +- samples/wizard/makefile.vc | 6 +- samples/wizard/makefile.wat | 8 +- samples/wxtest/Makefile.in | 11 +- samples/wxtest/makefile.bcc | 17 +- samples/wxtest/makefile.gcc | 6 +- samples/wxtest/makefile.vc | 6 +- samples/wxtest/makefile.wat | 8 +- samples/xrc/Makefile.in | 16 +- samples/xrc/makefile.bcc | 17 +- samples/xrc/makefile.gcc | 6 +- samples/xrc/makefile.vc | 7 +- samples/xrc/makefile.wat | 10 +- src/stc/Makefile.in | 13 +- src/xrc/Makefile.in | 168 +- utils/HelpGen/src/Makefile.in | 4 +- utils/HelpGen/src/makefile.bcc | 17 +- utils/HelpGen/src/makefile.gcc | 5 +- utils/HelpGen/src/makefile.vc | 8 +- utils/HelpGen/src/makefile.wat | 8 +- utils/configtool/src/Makefile.in | 13 +- utils/configtool/src/makefile.bcc | 18 +- utils/configtool/src/makefile.gcc | 10 +- utils/configtool/src/makefile.vc | 13 +- utils/configtool/src/makefile.wat | 5 +- utils/emulator/src/Makefile.in | 13 +- utils/emulator/src/makefile.bcc | 18 +- utils/emulator/src/makefile.gcc | 10 +- utils/emulator/src/makefile.vc | 6 +- utils/emulator/src/makefile.wat | 5 +- utils/helpview/src/Makefile.in | 11 +- utils/helpview/src/makefile.bcc | 18 +- utils/helpview/src/makefile.gcc | 6 +- utils/helpview/src/makefile.vc | 6 +- utils/helpview/src/makefile.wat | 5 +- utils/hhp2cached/Makefile.in | 11 +- utils/hhp2cached/makefile.bcc | 17 +- utils/hhp2cached/makefile.gcc | 10 +- utils/hhp2cached/makefile.vc | 8 +- utils/hhp2cached/makefile.wat | 4 +- utils/makefile.bcc | 9 +- utils/tex2rtf/src/Makefile.in | 18 +- utils/tex2rtf/src/makefile.bcc | 29 +- utils/tex2rtf/src/makefile.gcc | 15 +- utils/tex2rtf/src/makefile.vc | 12 +- utils/tex2rtf/src/makefile.wat | 16 +- utils/wxrc/Makefile.in | 4 +- utils/wxrc/makefile.bcc | 17 +- utils/wxrc/makefile.gcc | 8 +- utils/wxrc/makefile.vc | 6 +- utils/wxrc/makefile.wat | 8 +- 671 files changed, 5643 insertions(+), 5606 deletions(-) diff --git a/Makefile.in b/Makefile.in index e107ae6..d4ecb08 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2455,7 +2455,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_vscroll.o @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS) COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ - $(__LOWLEVEL_SRC_OBJECTS_9) \ + $(__LOWLEVEL_SRC_OBJECTS_0) \ $(__GUI_SRC_OBJECTS_1) \ monolib_accesscmn.o \ monolib_appcmn.o \ @@ -2553,7 +2553,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_vscroll.o @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1) COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ - $(__LOWLEVEL_SRC_OBJECTS_9) \ + $(__LOWLEVEL_SRC_OBJECTS_0) \ monolib_accel.o \ monolib_colrdlgg.o \ monolib_dirdlgg.o \ @@ -2699,7 +2699,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_vscroll.o @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1) COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ - $(__LOWLEVEL_SRC_OBJECTS_0) \ + $(__LOWLEVEL_SRC_OBJECTS_8) \ $(__GUI_SRC_OBJECTS_2) \ coredll_accesscmn.o \ coredll_appcmn.o \ @@ -2797,7 +2797,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_vscroll.o @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2) COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ - $(__LOWLEVEL_SRC_OBJECTS_0) \ + $(__LOWLEVEL_SRC_OBJECTS_8) \ coredll_accel.o \ coredll_colrdlgg.o \ coredll_dirdlgg.o \ @@ -2943,7 +2943,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_vscroll.o @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2) COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ - $(__LOWLEVEL_SRC_OBJECTS_8) \ + $(__LOWLEVEL_SRC_OBJECTS_9) \ $(__GUI_SRC_OBJECTS_3) \ corelib_accesscmn.o \ corelib_appcmn.o \ @@ -3041,7 +3041,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_vscroll.o @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3) COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ - $(__LOWLEVEL_SRC_OBJECTS_8) \ + $(__LOWLEVEL_SRC_OBJECTS_9) \ corelib_accel.o \ corelib_colrdlgg.o \ corelib_dirdlgg.o \ @@ -4987,6 +4987,181 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS = \ @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS) @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_0 = COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0 = \ + monolib_caret.o \ + monolib_dialup.o \ + monolib_fontenum.o \ + monolib_fontutil.o \ + monolib_utilsx11.o \ + monolib_displayx11.o \ + monolib_paletteg.o \ + monolib_app.o \ + monolib_bitmap.o \ + monolib_brush.o \ + monolib_clipbrd.o \ + monolib_colour.o \ + monolib_cursor.o \ + monolib_data.o \ + monolib_dataobj.o \ + monolib_dc.o \ + monolib_dcclient.o \ + monolib_dcmemory.o \ + monolib_dcscreen.o \ + monolib_dnd.o \ + monolib_evtloop.o \ + monolib_font.o \ + monolib_gdiobj.o \ + monolib_gsockgtk.o \ + monolib_icon.o \ + monolib_main.o \ + monolib_minifram.o \ + monolib_pen.o \ + monolib_popupwin.o \ + monolib_region.o \ + monolib_renderer.o \ + monolib_settings.o \ + monolib_timer.o \ + monolib_tooltip.o \ + monolib_toplevel.o \ + monolib_utilsgtk.o \ + monolib_win_gtk.o \ + monolib_window.o +@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0) +@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_0 = +COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_0 = \ + monolib_caret.o \ + monolib_timer.o \ + monolib_app.o \ + monolib_bitmap.o \ + monolib_brush.o \ + monolib_clipbrd.o \ + monolib_colour.o \ + monolib_cursor.o \ + monolib_data.o \ + monolib_dc.o \ + monolib_dcclient.o \ + monolib_dcmemory.o \ + monolib_dcscreen.o \ + monolib_dirmgl.o \ + monolib_evtloop.o \ + monolib_font.o \ + monolib_fontenum.o \ + monolib_fontutil.o \ + monolib_gdiobj.o \ + monolib_icon.o \ + monolib_palette.o \ + monolib_pen.o \ + monolib_region.o \ + monolib_settings.o \ + monolib_toplevel.o \ + monolib_utils.o \ + monolib_window.o +@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_0) +COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0 = \ + monolib_caret.o \ + monolib_dialup.o \ + monolib_fontenum.o \ + monolib_fontutil.o \ + monolib_utilsx11.o \ + monolib_displayx11.o \ + monolib_bitmap.o \ + monolib_brush.o \ + monolib_pen.o \ + monolib_region.o \ + monolib_utilsx.o +@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0) +COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0 = \ + monolib_app.o \ + monolib_bitmap.o \ + monolib_brush.o \ + monolib_caret.o \ + monolib_clipbrd.o \ + monolib_colour.o \ + monolib_cursor.o \ + monolib_data.o \ + monolib_dc.o \ + monolib_dcclient.o \ + monolib_dcmemory.o \ + monolib_dcprint.o \ + monolib_dcscreen.o \ + monolib_dialup.o \ + monolib_dib.o \ + monolib_dirdlg.o \ + monolib_display.o \ + monolib_enhmeta.o \ + monolib_evtloop.o \ + monolib_font.o \ + monolib_fontenum.o \ + monolib_fontutil.o \ + monolib_gdiimage.o \ + monolib_gdiobj.o \ + monolib_gsockmsw.o \ + monolib_helpchm.o \ + monolib_helpwin.o \ + monolib_icon.o \ + monolib_minifram.o \ + monolib_automtn.o \ + monolib_dataobj.o \ + monolib_dropsrc.o \ + monolib_droptgt.o \ + monolib_oleutils.o \ + monolib_uuid.o \ + monolib_palette.o \ + monolib_pen.o \ + monolib_popupwin.o \ + monolib_printdlg.o \ + monolib_printwin.o \ + monolib_region.o \ + monolib_renderer.o \ + monolib_settings.o \ + monolib_timer.o \ + monolib_tooltip.o \ + monolib_toplevel.o \ + monolib_utilsgui.o \ + monolib_uxtheme.o \ + monolib_window.o +@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0) +@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_0 = +COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0 = \ + monolib_caret.o \ + monolib_dialup.o \ + monolib_fontenum.o \ + monolib_fontutil.o \ + monolib_utilsx11.o \ + monolib_displayx11.o \ + monolib_timer.o \ + monolib_app.o \ + monolib_bitmap.o \ + monolib_brush.o \ + monolib_clipbrd.o \ + monolib_colour.o \ + monolib_cursor.o \ + monolib_data.o \ + monolib_dataobj.o \ + monolib_dc.o \ + monolib_dcclient.o \ + monolib_dcmemory.o \ + monolib_dcscreen.o \ + monolib_evtloop.o \ + monolib_font.o \ + monolib_gdiobj.o \ + monolib_gsockx11.o \ + monolib_icon.o \ + monolib_main.o \ + monolib_minifram.o \ + monolib_nanox.o \ + monolib_palette.o \ + monolib_pen.o \ + monolib_popupwin.o \ + monolib_region.o \ + monolib_reparent.o \ + monolib_settings.o \ + monolib_toplevel.o \ + monolib_utils.o \ + monolib_utilsx.o \ + monolib_window.o +@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0) +@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_8 = +COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8 = \ coredll_caret.o \ coredll_dialup.o \ coredll_fontenum.o \ @@ -5025,9 +5200,9 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0 = \ coredll_utilsgtk.o \ coredll_win_gtk.o \ coredll_window.o -@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0) -@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_0 = -COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_0 = \ +@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8) +@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_8 = +COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8 = \ coredll_caret.o \ coredll_timer.o \ coredll_app.o \ @@ -5055,8 +5230,8 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_0 = \ coredll_toplevel.o \ coredll_utils.o \ coredll_window.o -@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_0) -COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0 = \ +@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8) +COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8 = \ coredll_caret.o \ coredll_dialup.o \ coredll_fontenum.o \ @@ -5068,8 +5243,8 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0 = \ coredll_pen.o \ coredll_region.o \ coredll_utilsx.o -@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0) -COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0 = \ +@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8) +COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8 = \ coredll_app.o \ coredll_bitmap.o \ coredll_brush.o \ @@ -5119,9 +5294,9 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0 = \ coredll_utilsgui.o \ coredll_uxtheme.o \ coredll_window.o -@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0) -@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_0 = -COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0 = \ +@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8) +@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_8 = +COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8 = \ coredll_caret.o \ coredll_dialup.o \ coredll_fontenum.o \ @@ -5159,9 +5334,9 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0 = \ coredll_utils.o \ coredll_utilsx.o \ coredll_window.o -@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0) -@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_8 = -COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8 = \ +@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8) +@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_9 = +COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9 = \ corelib_caret.o \ corelib_dialup.o \ corelib_fontenum.o \ @@ -5200,9 +5375,9 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8 = \ corelib_utilsgtk.o \ corelib_win_gtk.o \ corelib_window.o -@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8) -@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_8 = -COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8 = \ +@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9) +@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_9 = +COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_9 = \ corelib_caret.o \ corelib_timer.o \ corelib_app.o \ @@ -5230,8 +5405,8 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8 = \ corelib_toplevel.o \ corelib_utils.o \ corelib_window.o -@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8) -COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8 = \ +@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_9) +COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9 = \ corelib_caret.o \ corelib_dialup.o \ corelib_fontenum.o \ @@ -5243,8 +5418,8 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8 = \ corelib_pen.o \ corelib_region.o \ corelib_utilsx.o -@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8) -COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8 = \ +@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9) +COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9 = \ corelib_app.o \ corelib_bitmap.o \ corelib_brush.o \ @@ -5294,9 +5469,9 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8 = \ corelib_utilsgui.o \ corelib_uxtheme.o \ corelib_window.o -@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8) -@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_8 = -COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8 = \ +@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9) +@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_9 = +COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9 = \ corelib_caret.o \ corelib_dialup.o \ corelib_fontenum.o \ @@ -5334,181 +5509,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8 = \ corelib_utils.o \ corelib_utilsx.o \ corelib_window.o -@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8) -@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_9 = -COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9 = \ - monolib_caret.o \ - monolib_dialup.o \ - monolib_fontenum.o \ - monolib_fontutil.o \ - monolib_utilsx11.o \ - monolib_displayx11.o \ - monolib_paletteg.o \ - monolib_app.o \ - monolib_bitmap.o \ - monolib_brush.o \ - monolib_clipbrd.o \ - monolib_colour.o \ - monolib_cursor.o \ - monolib_data.o \ - monolib_dataobj.o \ - monolib_dc.o \ - monolib_dcclient.o \ - monolib_dcmemory.o \ - monolib_dcscreen.o \ - monolib_dnd.o \ - monolib_evtloop.o \ - monolib_font.o \ - monolib_gdiobj.o \ - monolib_gsockgtk.o \ - monolib_icon.o \ - monolib_main.o \ - monolib_minifram.o \ - monolib_pen.o \ - monolib_popupwin.o \ - monolib_region.o \ - monolib_renderer.o \ - monolib_settings.o \ - monolib_timer.o \ - monolib_tooltip.o \ - monolib_toplevel.o \ - monolib_utilsgtk.o \ - monolib_win_gtk.o \ - monolib_window.o -@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9) -@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_9 = -COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_9 = \ - monolib_caret.o \ - monolib_timer.o \ - monolib_app.o \ - monolib_bitmap.o \ - monolib_brush.o \ - monolib_clipbrd.o \ - monolib_colour.o \ - monolib_cursor.o \ - monolib_data.o \ - monolib_dc.o \ - monolib_dcclient.o \ - monolib_dcmemory.o \ - monolib_dcscreen.o \ - monolib_dirmgl.o \ - monolib_evtloop.o \ - monolib_font.o \ - monolib_fontenum.o \ - monolib_fontutil.o \ - monolib_gdiobj.o \ - monolib_icon.o \ - monolib_palette.o \ - monolib_pen.o \ - monolib_region.o \ - monolib_settings.o \ - monolib_toplevel.o \ - monolib_utils.o \ - monolib_window.o -@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_9) -COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9 = \ - monolib_caret.o \ - monolib_dialup.o \ - monolib_fontenum.o \ - monolib_fontutil.o \ - monolib_utilsx11.o \ - monolib_displayx11.o \ - monolib_bitmap.o \ - monolib_brush.o \ - monolib_pen.o \ - monolib_region.o \ - monolib_utilsx.o -@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9) -COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9 = \ - monolib_app.o \ - monolib_bitmap.o \ - monolib_brush.o \ - monolib_caret.o \ - monolib_clipbrd.o \ - monolib_colour.o \ - monolib_cursor.o \ - monolib_data.o \ - monolib_dc.o \ - monolib_dcclient.o \ - monolib_dcmemory.o \ - monolib_dcprint.o \ - monolib_dcscreen.o \ - monolib_dialup.o \ - monolib_dib.o \ - monolib_dirdlg.o \ - monolib_display.o \ - monolib_enhmeta.o \ - monolib_evtloop.o \ - monolib_font.o \ - monolib_fontenum.o \ - monolib_fontutil.o \ - monolib_gdiimage.o \ - monolib_gdiobj.o \ - monolib_gsockmsw.o \ - monolib_helpchm.o \ - monolib_helpwin.o \ - monolib_icon.o \ - monolib_minifram.o \ - monolib_automtn.o \ - monolib_dataobj.o \ - monolib_dropsrc.o \ - monolib_droptgt.o \ - monolib_oleutils.o \ - monolib_uuid.o \ - monolib_palette.o \ - monolib_pen.o \ - monolib_popupwin.o \ - monolib_printdlg.o \ - monolib_printwin.o \ - monolib_region.o \ - monolib_renderer.o \ - monolib_settings.o \ - monolib_timer.o \ - monolib_tooltip.o \ - monolib_toplevel.o \ - monolib_utilsgui.o \ - monolib_uxtheme.o \ - monolib_window.o -@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9) -@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_9 = -COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9 = \ - monolib_caret.o \ - monolib_dialup.o \ - monolib_fontenum.o \ - monolib_fontutil.o \ - monolib_utilsx11.o \ - monolib_displayx11.o \ - monolib_timer.o \ - monolib_app.o \ - monolib_bitmap.o \ - monolib_brush.o \ - monolib_clipbrd.o \ - monolib_colour.o \ - monolib_cursor.o \ - monolib_data.o \ - monolib_dataobj.o \ - monolib_dc.o \ - monolib_dcclient.o \ - monolib_dcmemory.o \ - monolib_dcscreen.o \ - monolib_evtloop.o \ - monolib_font.o \ - monolib_gdiobj.o \ - monolib_gsockx11.o \ - monolib_icon.o \ - monolib_main.o \ - monolib_minifram.o \ - monolib_nanox.o \ - monolib_palette.o \ - monolib_pen.o \ - monolib_popupwin.o \ - monolib_region.o \ - monolib_reparent.o \ - monolib_settings.o \ - monolib_toplevel.o \ - monolib_utils.o \ - monolib_utilsx.o \ - monolib_window.o @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9) COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ $(__CORE_SRC_OBJECTS) \ @@ -7158,27 +7158,27 @@ coredll_access.o: $(srcdir)/src/msw/ole/access.cpp $(COREDLL_ODEP) coredll_aga.o: $(srcdir)/src/mac/aga.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@coredll_app.o: $(srcdir)/src/msw/app.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@coredll_app.o: $(srcdir)/src/gtk/app.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_app.o: $(srcdir)/src/motif/app.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MGL_USE_GUI_1@coredll_app.o: $(srcdir)/src/mgl/app.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_app.o: $(srcdir)/src/cocoa/app.mm $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_MSW_USE_GUI_1@coredll_app.o: $(srcdir)/src/msw/app.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_app.o: $(srcdir)/src/os2/app.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_app.o: $(srcdir)/src/cocoa/app.mm $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@coredll_app.o: $(srcdir)/src/gtk/app.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_app.o: $(srcdir)/src/mac/app.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_app.o: $(srcdir)/src/motif/app.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@coredll_app.o: $(srcdir)/src/x11/app.cpp $(COREDLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7194,18 +7194,12 @@ coredll_aga.o: $(srcdir)/src/mac/aga.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@coredll_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MGL_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7218,27 +7212,33 @@ coredll_aga.o: $(srcdir)/src/mac/aga.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_bitmap.o: $(srcdir)/src/mac/bitmap.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1@coredll_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/cocoa/bmpbuttn.mm $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_USE_GUI_1_WXUNIV_1@coredll_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/mac/bmpbuttn.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7260,15 +7260,15 @@ coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_brush.o: $(srcdir)/src/cocoa/brush.mm $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MGL_USE_GUI_1@coredll_brush.o: $(srcdir)/src/mgl/brush.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_brush.o: $(srcdir)/src/x11/brush.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@coredll_brush.o: $(srcdir)/src/x11/brush.cpp $(COREDLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MGL_USE_GUI_1@coredll_brush.o: $(srcdir)/src/mgl/brush.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_brush.o: $(srcdir)/src/mac/brush.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7284,15 +7284,15 @@ coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/motif/button.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_USE_GUI_1_WXUNIV_1@coredll_button.o: $(srcdir)/src/univ/button.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/cocoa/button.mm $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/gtk/button.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1_WXUNIV_1@coredll_button.o: $(srcdir)/src/univ/button.cpp $(COREDLL_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/mac/button.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7323,15 +7323,15 @@ coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/cocoa/checkbox.mm $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/mac/checkbox.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7347,6 +7347,9 @@ coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/os2/checklst.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_USE_GUI_1_WXUNIV_1@coredll_checklst.o: $(srcdir)/src/univ/checklst.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/gtk/checklst.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7356,9 +7359,6 @@ coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/msw/checklst.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1_WXUNIV_1@coredll_checklst.o: $(srcdir)/src/univ/checklst.cpp $(COREDLL_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/cocoa/checklst.mm $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7371,22 +7371,25 @@ coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/os2/choice.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/motif/choice.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/mac/choice.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/gtk/choice.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/msw/choice.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/cocoa/choice.mm $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@coredll_choice.o: $(srcdir)/src/univ/choice.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/motif/choice.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/gtk/choice.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/cocoa/choice.mm $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@coredll_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(COREDLL_ODEP) @@ -7395,18 +7398,15 @@ coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@coredll_clipbrd.o: $(srcdir)/src/gtk/clipbrd.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_clipbrd.o: $(srcdir)/src/mac/clipbrd.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@coredll_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(COREDLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_clipbrd.o: $(srcdir)/src/mac/clipbrd.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MGL_USE_GUI_1@coredll_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7428,8 +7428,11 @@ coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_colordlg.o: $(srcdir)/src/mac/colordlg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_X11_USE_GUI_1@coredll_colour.o: $(srcdir)/src/x11/colour.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MGL_USE_GUI_1@coredll_colour.o: $(srcdir)/src/mgl/colour.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_X11_USE_GUI_1@coredll_colour.o: $(srcdir)/src/x11/colour.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_colour.o: $(srcdir)/src/os2/colour.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7437,21 +7440,18 @@ coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_colour.o: $(srcdir)/src/mac/colour.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_colour.o: $(srcdir)/src/cocoa/colour.mm $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_colour.o: $(srcdir)/src/motif/colour.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MGL_USE_GUI_1@coredll_colour.o: $(srcdir)/src/mgl/colour.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1@coredll_colour.o: $(srcdir)/src/gtk/colour.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_colour.o: $(srcdir)/src/cocoa/colour.mm $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@coredll_colour.o: $(srcdir)/src/msw/colour.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_colour.o: $(srcdir)/src/motif/colour.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7473,12 +7473,12 @@ coredll_colschem.o: $(srcdir)/src/univ/colschem.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/os2/combobox.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/motif/combobox.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_USE_GUI_1_WXUNIV_1@coredll_combobox.o: $(srcdir)/src/univ/combobox.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/motif/combobox.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/mac/combobox.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7500,6 +7500,9 @@ coredll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(COREDLL_ODE @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/gtk/control.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/cocoa/control.mm $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/mac/control.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7512,9 +7515,6 @@ coredll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(COREDLL_ODE @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/msw/control.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/cocoa/control.mm $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/os2/control.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7530,21 +7530,21 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_cursor.o: $(srcdir)/src/motif/cursor.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_X11_USE_GUI_1@coredll_cursor.o: $(srcdir)/src/x11/cursor.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MGL_USE_GUI_1@coredll_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_cursor.o: $(srcdir)/src/motif/cursor.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@coredll_cursor.o: $(srcdir)/src/msw/cursor.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_cursor.o: $(srcdir)/src/os2/cursor.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_X11_USE_GUI_1@coredll_cursor.o: $(srcdir)/src/x11/cursor.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_cursor.o: $(srcdir)/src/cocoa/cursor.mm $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7554,8 +7554,11 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_cursor.o: $(srcdir)/src/mac/cursor.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_data.o: $(srcdir)/src/cocoa/data.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_data.o: $(srcdir)/src/motif/data.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_data.o: $(srcdir)/src/os2/data.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@coredll_data.o: $(srcdir)/src/x11/data.cpp $(COREDLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7569,21 +7572,24 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_data.o: $(srcdir)/src/mac/data.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_data.o: $(srcdir)/src/cocoa/data.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MGL_USE_GUI_1@coredll_data.o: $(srcdir)/src/mgl/data.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_data.o: $(srcdir)/src/motif/data.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_data.o: $(srcdir)/src/os2/data.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_USE_GUI_1@coredll_datacmn.o: $(srcdir)/src/common/datacmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dataobj.o: $(srcdir)/src/cocoa/dataobj.mm $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_dataobj.o: $(srcdir)/src/mac/dataobj.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@coredll_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7593,12 +7599,6 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_dataobj.o: $(srcdir)/src/mac/dataobj.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1@coredll_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7608,6 +7608,9 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_dc.o: $(srcdir)/src/mac/dc.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@coredll_dc.o: $(srcdir)/src/gtk/dc.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@coredll_dc.o: $(srcdir)/src/msw/dc.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7617,9 +7620,6 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@coredll_dc.o: $(srcdir)/src/mgl/dc.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1@coredll_dc.o: $(srcdir)/src/gtk/dc.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dc.o: $(srcdir)/src/motif/dc.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7629,6 +7629,12 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MGL_USE_GUI_1@coredll_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_X11_USE_GUI_1@coredll_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7638,23 +7644,20 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@coredll_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MGL_USE_GUI_1@coredll_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_X11_USE_GUI_1@coredll_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1@coredll_dcclient.o: $(srcdir)/src/gtk/dcclient.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_dcclient.o: $(srcdir)/src/mac/dcclient.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_GTK_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp $(COREDLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7662,21 +7665,18 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MGL_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_dcmemory.o: $(srcdir)/src/mac/dcmemory.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MGL_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7701,6 +7701,9 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dcscreen.o: $(srcdir)/src/cocoa/dcscreen.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1@coredll_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7710,11 +7713,11 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_dcscreen.o: $(srcdir)/src/mac/dcscreen.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/motif/dialog.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/os2/dialog.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/mac/dialog.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7722,11 +7725,8 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/motif/dialog.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/os2/dialog.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/msw/dialog.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7839,24 +7839,24 @@ coredll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(COREDLL_ODEP) coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_X11_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MGL_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_X11_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7911,12 +7911,6 @@ coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@coredll_font.o: $(srcdir)/src/mgl/font.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_font.o: $(srcdir)/src/os2/font.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_font.o: $(srcdir)/src/cocoa/font.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1@coredll_font.o: $(srcdir)/src/msw/font.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7926,12 +7920,18 @@ coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_font.o: $(srcdir)/src/mac/font.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_font.o: $(srcdir)/src/os2/font.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_font.o: $(srcdir)/src/motif/font.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@coredll_font.o: $(srcdir)/src/gtk/font.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_font.o: $(srcdir)/src/cocoa/font.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1@coredll_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7959,6 +7959,9 @@ coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MGL_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7971,9 +7974,6 @@ coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(COREDLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_fontenum.o: $(srcdir)/src/mac/fontenum.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7986,18 +7986,12 @@ coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_fontmap.o: $(srcdir)/src/common/fontmap.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_fontutil.o: $(srcdir)/src/mac/fontutil.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8010,6 +8004,18 @@ coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_fontutil.o: $(srcdir)/src/mac/fontutil.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/motif/frame.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/msw/frame.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/mac/frame.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8019,12 +8025,6 @@ coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/gtk/frame.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/motif/frame.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/msw/frame.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/cocoa/frame.mm $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8037,21 +8037,21 @@ coredll_framuniv.o: $(srcdir)/src/univ/framuniv.cpp $(COREDLL_ODEP) coredll_fs_mem.o: $(srcdir)/src/common/fs_mem.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/gtk/gauge.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/motif/gauge.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@coredll_gauge.o: $(srcdir)/src/univ/gauge.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/os2/gauge.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/motif/gauge.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/mac/gauge.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8073,12 +8073,21 @@ coredll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@coredll_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/cocoa/gdiobj.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@coredll_gdiobj.o: $(srcdir)/src/gtk/gdiobj.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/motif/gdiobj.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@coredll_gdiobj.o: $(srcdir)/src/x11/gdiobj.cpp $(COREDLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/cocoa/gdiobj.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MGL_USE_GUI_1@coredll_gdiobj.o: $(srcdir)/src/mgl/gdiobj.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8088,15 +8097,6 @@ coredll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/mac/gdiobj.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1@coredll_gdiobj.o: $(srcdir)/src/gtk/gdiobj.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/motif/gdiobj.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_USE_GUI_1@coredll_geometry.o: $(srcdir)/src/common/geometry.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8136,8 +8136,11 @@ coredll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@coredll_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/cocoa/icon.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MGL_USE_GUI_1@coredll_icon.o: $(srcdir)/src/mgl/icon.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/motif/icon.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/os2/icon.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8145,21 +8148,18 @@ coredll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@coredll_icon.o: $(srcdir)/src/msw/icon.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/cocoa/icon.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_GTK_USE_GUI_1@coredll_icon.o: $(srcdir)/src/gtk/icon.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@coredll_icon.o: $(srcdir)/src/x11/icon.cpp $(COREDLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/mac/icon.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MGL_USE_GUI_1@coredll_icon.o: $(srcdir)/src/mgl/icon.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/motif/icon.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@coredll_icon.o: $(srcdir)/src/gtk/icon.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_USE_GUI_1@coredll_iconbndl.o: $(srcdir)/src/common/iconbndl.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8241,24 +8241,24 @@ coredll_inphand.o: $(srcdir)/src/univ/inphand.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_listbkg.o: $(srcdir)/src/generic/listbkg.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/msw/listbox.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_USE_GUI_1_WXUNIV_1@coredll_listbox.o: $(srcdir)/src/univ/listbox.cpp $(COREDLL_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/os2/listbox.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/motif/listbox.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_USE_GUI_1_WXUNIV_1@coredll_listbox.o: $(srcdir)/src/univ/listbox.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/msw/listbox.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/mac/listbox.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8286,21 +8286,21 @@ coredll_inphand.o: $(srcdir)/src/univ/inphand.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_logg.o: $(srcdir)/src/generic/logg.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_main.o: $(srcdir)/src/cocoa/main.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@coredll_main.o: $(srcdir)/src/gtk/main.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_main.o: $(srcdir)/src/os2/main.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_main.o: $(srcdir)/src/motif/main.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@coredll_main.o: $(srcdir)/src/gtk/main.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@coredll_main.o: $(srcdir)/src/x11/main.cpp $(COREDLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_main.o: $(srcdir)/src/cocoa/main.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_PLATFORM_WIN32_1@coredll_main.o: $(srcdir)/src/msw/main.cpp $(COREDLL_ODEP) @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8337,15 +8337,15 @@ coredll_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/motif/menu.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/gtk/menu.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/mac/menu.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/os2/menu.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/gtk/menu.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/msw/menu.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8505,12 +8505,18 @@ coredll_notebmac.o: $(srcdir)/src/mac/notebmac.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_paper.o: $(srcdir)/src/common/paper.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_pen.o: $(srcdir)/src/os2/pen.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@coredll_pen.o: $(srcdir)/src/msw/pen.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_pen.o: $(srcdir)/src/mac/pen.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@coredll_pen.o: $(srcdir)/src/gtk/pen.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_pen.o: $(srcdir)/src/x11/pen.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8523,12 +8529,6 @@ coredll_notebmac.o: $(srcdir)/src/mac/notebmac.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_pen.o: $(srcdir)/src/cocoa/pen.mm $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_pen.o: $(srcdir)/src/os2/pen.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@coredll_pen.o: $(srcdir)/src/gtk/pen.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - coredll_pnghand.o: $(srcdir)/src/mac/pnghand.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8613,30 +8613,33 @@ coredll_printmac.o: $(srcdir)/src/mac/printmac.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_radiobox.o: $(srcdir)/src/cocoa/radiobox.mm $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_USE_GUI_1_WXUNIV_1@coredll_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_USE_GUI_1_WXUNIV_1@coredll_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(COREDLL_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/mac/radiobut.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_USE_GUI_1@coredll_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@coredll_region.o: $(srcdir)/src/gtk/region.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_region.o: $(srcdir)/src/x11/region.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8649,18 +8652,15 @@ coredll_printmac.o: $(srcdir)/src/mac/printmac.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@coredll_region.o: $(srcdir)/src/mgl/region.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_region.o: $(srcdir)/src/mac/region.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@coredll_region.o: $(srcdir)/src/gtk/region.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1@coredll_region.o: $(srcdir)/src/msw/region.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_region.o: $(srcdir)/src/os2/region.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_region.o: $(srcdir)/src/mac/region.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1@coredll_rendcmn.o: $(srcdir)/src/common/rendcmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8691,9 +8691,6 @@ coredll_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/mac/scrolbar.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_USE_GUI_1_WXUNIV_1@coredll_scrolbar.o: $(srcdir)/src/univ/scrolbar.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8703,6 +8700,9 @@ coredll_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/gtk/scrolbar.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8718,21 +8718,21 @@ coredll_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@coredll_settings.o: $(srcdir)/src/msw/settings.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/motif/settings.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/os2/settings.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@coredll_settings.o: $(srcdir)/src/msw/settings.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/cocoa/settings.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@coredll_settings.o: $(srcdir)/src/gtk/settings.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/motif/settings.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@coredll_settings.o: $(srcdir)/src/x11/settings.cpp $(COREDLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8745,6 +8745,12 @@ coredll_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_sizer.o: $(srcdir)/src/common/sizer.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_USE_GUI_1_WXUNIV_1@coredll_slider.o: $(srcdir)/src/univ/slider.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/cocoa/slider.mm $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/gtk/slider.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8754,12 +8760,6 @@ coredll_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/os2/slider.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1_WXUNIV_1@coredll_slider.o: $(srcdir)/src/univ/slider.cpp $(COREDLL_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/cocoa/slider.mm $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/motif/slider.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8772,9 +8772,6 @@ coredll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1_WXUNIV_1@coredll_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(COREDLL_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/gtk/spinbutt.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8790,6 +8787,9 @@ coredll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_USE_GUI_1_WXUNIV_1@coredll_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1@coredll_spinctlg.o: $(srcdir)/src/generic/spinctlg.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8808,6 +8808,12 @@ coredll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_statbar.o: $(srcdir)/src/common/statbar.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8817,27 +8823,18 @@ coredll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@coredll_statbmp.o: $(srcdir)/src/univ/statbmp.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/mac/statbmp.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/cocoa/statbmp.mm $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/os2/statbox.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/mac/statbmp.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/mac/statbox.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/os2/statbox.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/motif/statbox.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8847,6 +8844,9 @@ coredll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@coredll_statbox.o: $(srcdir)/src/univ/statbox.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/msw/statbox.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8880,21 +8880,21 @@ coredll_statlmac.o: $(srcdir)/src/mac/statlmac.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/mac/stattext.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/motif/stattext.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/cocoa/stattext.mm $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/os2/stattext.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/motif/stattext.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/msw/stattext.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@coredll_stattext.o: $(srcdir)/src/univ/stattext.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8958,20 +8958,20 @@ coredll_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_USE_GUI_1_WXUNIV_1@coredll_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/mac/textctrl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8988,9 +8988,6 @@ coredll_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(COREDLL_ODEP) coredll_theme.o: $(srcdir)/src/univ/theme.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_timer.o: $(srcdir)/src/mac/timer.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1@coredll_timer.o: $(srcdir)/src/msw/timer.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -9003,6 +9000,9 @@ coredll_theme.o: $(srcdir)/src/univ/theme.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@coredll_timer.o: $(srcdir)/src/generic/timer.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_timer.o: $(srcdir)/src/mac/timer.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_timer.o: $(srcdir)/src/os2/timer.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -9042,21 +9042,21 @@ coredll_theme.o: $(srcdir)/src/univ/theme.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@coredll_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@coredll_toplevel.o: $(srcdir)/src/x11/toplevel.cpp $(COREDLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@coredll_toplevel.o: $(srcdir)/src/gtk/toplevel.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_toplevel.o: $(srcdir)/src/mac/toplevel.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -9174,15 +9174,15 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@coredll_window.o: $(srcdir)/src/gtk/window.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@coredll_window.o: $(srcdir)/src/msw/window.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_window.o: $(srcdir)/src/cocoa/window.mm $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@coredll_window.o: $(srcdir)/src/x11/window.cpp $(COREDLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@coredll_window.o: $(srcdir)/src/msw/window.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_window.o: $(srcdir)/src/os2/window.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -9266,27 +9266,27 @@ corelib_access.o: $(srcdir)/src/msw/ole/access.cpp $(CORELIB_ODEP) corelib_aga.o: $(srcdir)/src/mac/aga.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@corelib_app.o: $(srcdir)/src/msw/app.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@corelib_app.o: $(srcdir)/src/gtk/app.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_app.o: $(srcdir)/src/motif/app.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MGL_USE_GUI_1@corelib_app.o: $(srcdir)/src/mgl/app.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_app.o: $(srcdir)/src/cocoa/app.mm $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_MSW_USE_GUI_1@corelib_app.o: $(srcdir)/src/msw/app.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_app.o: $(srcdir)/src/os2/app.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_app.o: $(srcdir)/src/cocoa/app.mm $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@corelib_app.o: $(srcdir)/src/gtk/app.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_app.o: $(srcdir)/src/mac/app.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_app.o: $(srcdir)/src/motif/app.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@corelib_app.o: $(srcdir)/src/x11/app.cpp $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9302,18 +9302,12 @@ corelib_aga.o: $(srcdir)/src/mac/aga.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@corelib_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MGL_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9326,27 +9320,33 @@ corelib_aga.o: $(srcdir)/src/mac/aga.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_bitmap.o: $(srcdir)/src/mac/bitmap.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1@corelib_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/cocoa/bmpbuttn.mm $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_USE_GUI_1_WXUNIV_1@corelib_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/mac/bmpbuttn.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9368,15 +9368,15 @@ corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_brush.o: $(srcdir)/src/cocoa/brush.mm $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MGL_USE_GUI_1@corelib_brush.o: $(srcdir)/src/mgl/brush.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_brush.o: $(srcdir)/src/x11/brush.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@corelib_brush.o: $(srcdir)/src/x11/brush.cpp $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MGL_USE_GUI_1@corelib_brush.o: $(srcdir)/src/mgl/brush.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_brush.o: $(srcdir)/src/mac/brush.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9392,15 +9392,15 @@ corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/motif/button.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_USE_GUI_1_WXUNIV_1@corelib_button.o: $(srcdir)/src/univ/button.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/cocoa/button.mm $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/gtk/button.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1_WXUNIV_1@corelib_button.o: $(srcdir)/src/univ/button.cpp $(CORELIB_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/mac/button.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9431,15 +9431,15 @@ corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/cocoa/checkbox.mm $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/mac/checkbox.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9455,6 +9455,9 @@ corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/os2/checklst.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_USE_GUI_1_WXUNIV_1@corelib_checklst.o: $(srcdir)/src/univ/checklst.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/gtk/checklst.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9464,9 +9467,6 @@ corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/msw/checklst.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1_WXUNIV_1@corelib_checklst.o: $(srcdir)/src/univ/checklst.cpp $(CORELIB_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/cocoa/checklst.mm $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9479,22 +9479,25 @@ corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/os2/choice.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/motif/choice.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/mac/choice.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/gtk/choice.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/msw/choice.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/cocoa/choice.mm $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@corelib_choice.o: $(srcdir)/src/univ/choice.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/motif/choice.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/gtk/choice.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/cocoa/choice.mm $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@corelib_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(CORELIB_ODEP) @@ -9503,18 +9506,15 @@ corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@corelib_clipbrd.o: $(srcdir)/src/gtk/clipbrd.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_clipbrd.o: $(srcdir)/src/mac/clipbrd.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@corelib_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_clipbrd.o: $(srcdir)/src/mac/clipbrd.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MGL_USE_GUI_1@corelib_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9536,6 +9536,9 @@ corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_colordlg.o: $(srcdir)/src/mac/colordlg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MGL_USE_GUI_1@corelib_colour.o: $(srcdir)/src/mgl/colour.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@corelib_colour.o: $(srcdir)/src/x11/colour.cpp $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9545,21 +9548,18 @@ corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_colour.o: $(srcdir)/src/mac/colour.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_colour.o: $(srcdir)/src/cocoa/colour.mm $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_colour.o: $(srcdir)/src/motif/colour.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MGL_USE_GUI_1@corelib_colour.o: $(srcdir)/src/mgl/colour.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1@corelib_colour.o: $(srcdir)/src/gtk/colour.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_colour.o: $(srcdir)/src/cocoa/colour.mm $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@corelib_colour.o: $(srcdir)/src/msw/colour.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_colour.o: $(srcdir)/src/motif/colour.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9581,12 +9581,12 @@ corelib_colschem.o: $(srcdir)/src/univ/colschem.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/os2/combobox.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/motif/combobox.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_USE_GUI_1_WXUNIV_1@corelib_combobox.o: $(srcdir)/src/univ/combobox.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/motif/combobox.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/mac/combobox.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9608,6 +9608,9 @@ corelib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(CORELIB_ODE @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/gtk/control.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/cocoa/control.mm $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/mac/control.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9620,9 +9623,6 @@ corelib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(CORELIB_ODE @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/msw/control.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/cocoa/control.mm $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/os2/control.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9638,21 +9638,21 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_cursor.o: $(srcdir)/src/motif/cursor.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_X11_USE_GUI_1@corelib_cursor.o: $(srcdir)/src/x11/cursor.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MGL_USE_GUI_1@corelib_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_cursor.o: $(srcdir)/src/motif/cursor.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@corelib_cursor.o: $(srcdir)/src/msw/cursor.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_cursor.o: $(srcdir)/src/os2/cursor.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_X11_USE_GUI_1@corelib_cursor.o: $(srcdir)/src/x11/cursor.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_cursor.o: $(srcdir)/src/cocoa/cursor.mm $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9662,8 +9662,11 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_cursor.o: $(srcdir)/src/mac/cursor.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_data.o: $(srcdir)/src/cocoa/data.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_data.o: $(srcdir)/src/motif/data.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_data.o: $(srcdir)/src/os2/data.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@corelib_data.o: $(srcdir)/src/x11/data.cpp $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9677,21 +9680,24 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_data.o: $(srcdir)/src/mac/data.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_data.o: $(srcdir)/src/cocoa/data.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MGL_USE_GUI_1@corelib_data.o: $(srcdir)/src/mgl/data.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_data.o: $(srcdir)/src/motif/data.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_data.o: $(srcdir)/src/os2/data.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_USE_GUI_1@corelib_datacmn.o: $(srcdir)/src/common/datacmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dataobj.o: $(srcdir)/src/cocoa/dataobj.mm $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_dataobj.o: $(srcdir)/src/mac/dataobj.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@corelib_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9701,12 +9707,6 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_dataobj.o: $(srcdir)/src/mac/dataobj.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1@corelib_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9716,6 +9716,9 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_dc.o: $(srcdir)/src/mac/dc.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@corelib_dc.o: $(srcdir)/src/gtk/dc.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@corelib_dc.o: $(srcdir)/src/msw/dc.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9725,9 +9728,6 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@corelib_dc.o: $(srcdir)/src/mgl/dc.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1@corelib_dc.o: $(srcdir)/src/gtk/dc.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dc.o: $(srcdir)/src/motif/dc.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9737,6 +9737,12 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MGL_USE_GUI_1@corelib_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_X11_USE_GUI_1@corelib_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9746,23 +9752,20 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@corelib_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MGL_USE_GUI_1@corelib_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_X11_USE_GUI_1@corelib_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1@corelib_dcclient.o: $(srcdir)/src/gtk/dcclient.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_dcclient.o: $(srcdir)/src/mac/dcclient.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_GTK_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9770,21 +9773,18 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MGL_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_dcmemory.o: $(srcdir)/src/mac/dcmemory.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MGL_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9809,6 +9809,9 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dcscreen.o: $(srcdir)/src/cocoa/dcscreen.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1@corelib_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9818,11 +9821,11 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_dcscreen.o: $(srcdir)/src/mac/dcscreen.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/motif/dialog.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/os2/dialog.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/mac/dialog.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9830,11 +9833,8 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/motif/dialog.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/os2/dialog.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/msw/dialog.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9947,24 +9947,24 @@ corelib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(CORELIB_ODEP) corelib_event.o: $(srcdir)/src/common/event.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_X11_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MGL_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_X11_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10019,12 +10019,6 @@ corelib_event.o: $(srcdir)/src/common/event.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@corelib_font.o: $(srcdir)/src/mgl/font.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_font.o: $(srcdir)/src/os2/font.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_font.o: $(srcdir)/src/cocoa/font.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1@corelib_font.o: $(srcdir)/src/msw/font.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10034,12 +10028,18 @@ corelib_event.o: $(srcdir)/src/common/event.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_font.o: $(srcdir)/src/mac/font.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_font.o: $(srcdir)/src/os2/font.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_font.o: $(srcdir)/src/motif/font.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@corelib_font.o: $(srcdir)/src/gtk/font.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_font.o: $(srcdir)/src/cocoa/font.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1@corelib_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10067,6 +10067,9 @@ corelib_event.o: $(srcdir)/src/common/event.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MGL_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10079,9 +10082,6 @@ corelib_event.o: $(srcdir)/src/common/event.cpp $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_fontenum.o: $(srcdir)/src/mac/fontenum.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10094,18 +10094,12 @@ corelib_event.o: $(srcdir)/src/common/event.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_fontmap.o: $(srcdir)/src/common/fontmap.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_fontutil.o: $(srcdir)/src/mac/fontutil.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10118,6 +10112,18 @@ corelib_event.o: $(srcdir)/src/common/event.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_fontutil.o: $(srcdir)/src/mac/fontutil.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/motif/frame.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/msw/frame.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/mac/frame.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10127,12 +10133,6 @@ corelib_event.o: $(srcdir)/src/common/event.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/gtk/frame.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/motif/frame.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/msw/frame.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/cocoa/frame.mm $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10145,21 +10145,21 @@ corelib_framuniv.o: $(srcdir)/src/univ/framuniv.cpp $(CORELIB_ODEP) corelib_fs_mem.o: $(srcdir)/src/common/fs_mem.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/gtk/gauge.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/motif/gauge.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@corelib_gauge.o: $(srcdir)/src/univ/gauge.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/os2/gauge.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/motif/gauge.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/mac/gauge.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10181,12 +10181,21 @@ corelib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@corelib_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/cocoa/gdiobj.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@corelib_gdiobj.o: $(srcdir)/src/gtk/gdiobj.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/motif/gdiobj.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@corelib_gdiobj.o: $(srcdir)/src/x11/gdiobj.cpp $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/cocoa/gdiobj.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MGL_USE_GUI_1@corelib_gdiobj.o: $(srcdir)/src/mgl/gdiobj.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10196,15 +10205,6 @@ corelib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/mac/gdiobj.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1@corelib_gdiobj.o: $(srcdir)/src/gtk/gdiobj.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/motif/gdiobj.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_USE_GUI_1@corelib_geometry.o: $(srcdir)/src/common/geometry.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10244,8 +10244,11 @@ corelib_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@corelib_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/cocoa/icon.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MGL_USE_GUI_1@corelib_icon.o: $(srcdir)/src/mgl/icon.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/motif/icon.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/os2/icon.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10253,21 +10256,18 @@ corelib_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@corelib_icon.o: $(srcdir)/src/msw/icon.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/cocoa/icon.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_GTK_USE_GUI_1@corelib_icon.o: $(srcdir)/src/gtk/icon.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@corelib_icon.o: $(srcdir)/src/x11/icon.cpp $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/mac/icon.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MGL_USE_GUI_1@corelib_icon.o: $(srcdir)/src/mgl/icon.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/motif/icon.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@corelib_icon.o: $(srcdir)/src/gtk/icon.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_USE_GUI_1@corelib_iconbndl.o: $(srcdir)/src/common/iconbndl.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10349,24 +10349,24 @@ corelib_inphand.o: $(srcdir)/src/univ/inphand.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_listbkg.o: $(srcdir)/src/generic/listbkg.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/msw/listbox.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_USE_GUI_1_WXUNIV_1@corelib_listbox.o: $(srcdir)/src/univ/listbox.cpp $(CORELIB_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/os2/listbox.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/motif/listbox.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_USE_GUI_1_WXUNIV_1@corelib_listbox.o: $(srcdir)/src/univ/listbox.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/msw/listbox.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/mac/listbox.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10394,21 +10394,21 @@ corelib_inphand.o: $(srcdir)/src/univ/inphand.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_logg.o: $(srcdir)/src/generic/logg.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_main.o: $(srcdir)/src/cocoa/main.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@corelib_main.o: $(srcdir)/src/gtk/main.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_main.o: $(srcdir)/src/os2/main.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_main.o: $(srcdir)/src/motif/main.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@corelib_main.o: $(srcdir)/src/gtk/main.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@corelib_main.o: $(srcdir)/src/x11/main.cpp $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_main.o: $(srcdir)/src/cocoa/main.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_PLATFORM_WIN32_1@corelib_main.o: $(srcdir)/src/msw/main.cpp $(CORELIB_ODEP) @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10445,15 +10445,15 @@ corelib_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/motif/menu.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/gtk/menu.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/mac/menu.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/os2/menu.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/gtk/menu.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/msw/menu.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10613,12 +10613,18 @@ corelib_notebmac.o: $(srcdir)/src/mac/notebmac.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_paper.o: $(srcdir)/src/common/paper.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_pen.o: $(srcdir)/src/os2/pen.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@corelib_pen.o: $(srcdir)/src/msw/pen.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_pen.o: $(srcdir)/src/mac/pen.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@corelib_pen.o: $(srcdir)/src/gtk/pen.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_pen.o: $(srcdir)/src/x11/pen.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10631,12 +10637,6 @@ corelib_notebmac.o: $(srcdir)/src/mac/notebmac.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_pen.o: $(srcdir)/src/cocoa/pen.mm $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_pen.o: $(srcdir)/src/os2/pen.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@corelib_pen.o: $(srcdir)/src/gtk/pen.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - corelib_pnghand.o: $(srcdir)/src/mac/pnghand.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10721,30 +10721,33 @@ corelib_printmac.o: $(srcdir)/src/mac/printmac.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_radiobox.o: $(srcdir)/src/cocoa/radiobox.mm $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_USE_GUI_1_WXUNIV_1@corelib_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_USE_GUI_1_WXUNIV_1@corelib_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(CORELIB_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/mac/radiobut.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_USE_GUI_1@corelib_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@corelib_region.o: $(srcdir)/src/gtk/region.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_region.o: $(srcdir)/src/x11/region.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10757,18 +10760,15 @@ corelib_printmac.o: $(srcdir)/src/mac/printmac.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@corelib_region.o: $(srcdir)/src/mgl/region.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_region.o: $(srcdir)/src/mac/region.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@corelib_region.o: $(srcdir)/src/gtk/region.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1@corelib_region.o: $(srcdir)/src/msw/region.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_region.o: $(srcdir)/src/os2/region.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_region.o: $(srcdir)/src/mac/region.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1@corelib_rendcmn.o: $(srcdir)/src/common/rendcmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10799,9 +10799,6 @@ corelib_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/mac/scrolbar.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_USE_GUI_1_WXUNIV_1@corelib_scrolbar.o: $(srcdir)/src/univ/scrolbar.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10811,6 +10808,9 @@ corelib_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/gtk/scrolbar.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10826,21 +10826,21 @@ corelib_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@corelib_settings.o: $(srcdir)/src/msw/settings.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/motif/settings.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/os2/settings.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@corelib_settings.o: $(srcdir)/src/msw/settings.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/cocoa/settings.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@corelib_settings.o: $(srcdir)/src/gtk/settings.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/motif/settings.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@corelib_settings.o: $(srcdir)/src/x11/settings.cpp $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10853,6 +10853,12 @@ corelib_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_sizer.o: $(srcdir)/src/common/sizer.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_USE_GUI_1_WXUNIV_1@corelib_slider.o: $(srcdir)/src/univ/slider.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/cocoa/slider.mm $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/gtk/slider.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10862,12 +10868,6 @@ corelib_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/os2/slider.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1_WXUNIV_1@corelib_slider.o: $(srcdir)/src/univ/slider.cpp $(CORELIB_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/cocoa/slider.mm $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/motif/slider.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10880,9 +10880,6 @@ corelib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1_WXUNIV_1@corelib_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(CORELIB_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/gtk/spinbutt.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10898,6 +10895,9 @@ corelib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_USE_GUI_1_WXUNIV_1@corelib_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1@corelib_spinctlg.o: $(srcdir)/src/generic/spinctlg.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10916,6 +10916,12 @@ corelib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_statbar.o: $(srcdir)/src/common/statbar.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10925,27 +10931,18 @@ corelib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@corelib_statbmp.o: $(srcdir)/src/univ/statbmp.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/mac/statbmp.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/cocoa/statbmp.mm $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/os2/statbox.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/mac/statbmp.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/mac/statbox.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/os2/statbox.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/motif/statbox.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10955,6 +10952,9 @@ corelib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@corelib_statbox.o: $(srcdir)/src/univ/statbox.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/msw/statbox.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10988,21 +10988,21 @@ corelib_statlmac.o: $(srcdir)/src/mac/statlmac.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/mac/stattext.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/motif/stattext.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/cocoa/stattext.mm $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/os2/stattext.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/motif/stattext.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/msw/stattext.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@corelib_stattext.o: $(srcdir)/src/univ/stattext.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -11066,20 +11066,20 @@ corelib_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_USE_GUI_1_WXUNIV_1@corelib_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/mac/textctrl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -11096,9 +11096,6 @@ corelib_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(CORELIB_ODEP) corelib_theme.o: $(srcdir)/src/univ/theme.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_timer.o: $(srcdir)/src/mac/timer.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1@corelib_timer.o: $(srcdir)/src/msw/timer.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -11111,6 +11108,9 @@ corelib_theme.o: $(srcdir)/src/univ/theme.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@corelib_timer.o: $(srcdir)/src/generic/timer.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_timer.o: $(srcdir)/src/mac/timer.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_timer.o: $(srcdir)/src/os2/timer.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -11150,21 +11150,21 @@ corelib_theme.o: $(srcdir)/src/univ/theme.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@corelib_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@corelib_toplevel.o: $(srcdir)/src/x11/toplevel.cpp $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@corelib_toplevel.o: $(srcdir)/src/gtk/toplevel.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_toplevel.o: $(srcdir)/src/mac/toplevel.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -11282,15 +11282,15 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@corelib_window.o: $(srcdir)/src/gtk/window.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@corelib_window.o: $(srcdir)/src/msw/window.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_window.o: $(srcdir)/src/cocoa/window.mm $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@corelib_window.o: $(srcdir)/src/x11/window.cpp $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@corelib_window.o: $(srcdir)/src/msw/window.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_window.o: $(srcdir)/src/os2/window.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -11795,27 +11795,27 @@ monodll_access.o: $(srcdir)/src/msw/ole/access.cpp $(MONODLL_ODEP) monodll_aga.o: $(srcdir)/src/mac/aga.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@monodll_app.o: $(srcdir)/src/msw/app.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@monodll_app.o: $(srcdir)/src/gtk/app.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_app.o: $(srcdir)/src/motif/app.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MGL_USE_GUI_1@monodll_app.o: $(srcdir)/src/mgl/app.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_app.o: $(srcdir)/src/cocoa/app.mm $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_MSW_USE_GUI_1@monodll_app.o: $(srcdir)/src/msw/app.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_app.o: $(srcdir)/src/os2/app.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_app.o: $(srcdir)/src/cocoa/app.mm $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monodll_app.o: $(srcdir)/src/gtk/app.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_app.o: $(srcdir)/src/mac/app.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_app.o: $(srcdir)/src/motif/app.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@monodll_app.o: $(srcdir)/src/x11/app.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11849,18 +11849,12 @@ monodll_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monodll_baseunix.o: $(srcdir)/src/unix/baseunix.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MGL_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11873,27 +11867,33 @@ monodll_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_bitmap.o: $(srcdir)/src/mac/bitmap.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1@monodll_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/cocoa/bmpbuttn.mm $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_USE_GUI_1_WXUNIV_1@monodll_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/mac/bmpbuttn.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11915,15 +11915,15 @@ monodll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_brush.o: $(srcdir)/src/cocoa/brush.mm $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MGL_USE_GUI_1@monodll_brush.o: $(srcdir)/src/mgl/brush.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_brush.o: $(srcdir)/src/x11/brush.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@monodll_brush.o: $(srcdir)/src/x11/brush.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MGL_USE_GUI_1@monodll_brush.o: $(srcdir)/src/mgl/brush.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_brush.o: $(srcdir)/src/mac/brush.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11939,15 +11939,15 @@ monodll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/motif/button.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_USE_GUI_1_WXUNIV_1@monodll_button.o: $(srcdir)/src/univ/button.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/cocoa/button.mm $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/gtk/button.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1_WXUNIV_1@monodll_button.o: $(srcdir)/src/univ/button.cpp $(MONODLL_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/mac/button.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11981,15 +11981,15 @@ monodll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/cocoa/checkbox.mm $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/mac/checkbox.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12005,6 +12005,9 @@ monodll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/os2/checklst.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_USE_GUI_1_WXUNIV_1@monodll_checklst.o: $(srcdir)/src/univ/checklst.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/gtk/checklst.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12014,9 +12017,6 @@ monodll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/msw/checklst.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1_WXUNIV_1@monodll_checklst.o: $(srcdir)/src/univ/checklst.cpp $(MONODLL_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/cocoa/checklst.mm $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12035,22 +12035,25 @@ monodll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/os2/choice.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/motif/choice.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/mac/choice.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/gtk/choice.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/msw/choice.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/cocoa/choice.mm $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monodll_choice.o: $(srcdir)/src/univ/choice.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/motif/choice.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/gtk/choice.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/cocoa/choice.mm $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@monodll_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(MONODLL_ODEP) @@ -12059,18 +12062,15 @@ monodll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@monodll_clipbrd.o: $(srcdir)/src/gtk/clipbrd.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_clipbrd.o: $(srcdir)/src/mac/clipbrd.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@monodll_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_clipbrd.o: $(srcdir)/src/mac/clipbrd.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MGL_USE_GUI_1@monodll_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12098,6 +12098,9 @@ monodll_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_colordlg.o: $(srcdir)/src/mac/colordlg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MGL_USE_GUI_1@monodll_colour.o: $(srcdir)/src/mgl/colour.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@monodll_colour.o: $(srcdir)/src/x11/colour.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12107,21 +12110,18 @@ monodll_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_colour.o: $(srcdir)/src/mac/colour.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_colour.o: $(srcdir)/src/cocoa/colour.mm $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_colour.o: $(srcdir)/src/motif/colour.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_MGL_USE_GUI_1@monodll_colour.o: $(srcdir)/src/mgl/colour.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1@monodll_colour.o: $(srcdir)/src/gtk/colour.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_colour.o: $(srcdir)/src/cocoa/colour.mm $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@monodll_colour.o: $(srcdir)/src/msw/colour.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_colour.o: $(srcdir)/src/motif/colour.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12143,12 +12143,12 @@ monodll_colschem.o: $(srcdir)/src/univ/colschem.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/os2/combobox.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/motif/combobox.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_USE_GUI_1_WXUNIV_1@monodll_combobox.o: $(srcdir)/src/univ/combobox.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/motif/combobox.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/mac/combobox.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12173,6 +12173,9 @@ monodll_config.o: $(srcdir)/src/common/config.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/gtk/control.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/cocoa/control.mm $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/mac/control.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12185,9 +12188,6 @@ monodll_config.o: $(srcdir)/src/common/config.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/msw/control.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/cocoa/control.mm $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/os2/control.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12206,21 +12206,21 @@ monodll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_cursor.o: $(srcdir)/src/motif/cursor.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_X11_USE_GUI_1@monodll_cursor.o: $(srcdir)/src/x11/cursor.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MGL_USE_GUI_1@monodll_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_cursor.o: $(srcdir)/src/motif/cursor.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@monodll_cursor.o: $(srcdir)/src/msw/cursor.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_cursor.o: $(srcdir)/src/os2/cursor.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_X11_USE_GUI_1@monodll_cursor.o: $(srcdir)/src/x11/cursor.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_cursor.o: $(srcdir)/src/cocoa/cursor.mm $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12230,8 +12230,11 @@ monodll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_cursor.o: $(srcdir)/src/mac/cursor.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_data.o: $(srcdir)/src/cocoa/data.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_data.o: $(srcdir)/src/motif/data.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_data.o: $(srcdir)/src/os2/data.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@monodll_data.o: $(srcdir)/src/x11/data.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12245,21 +12248,24 @@ monodll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_data.o: $(srcdir)/src/mac/data.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_data.o: $(srcdir)/src/cocoa/data.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MGL_USE_GUI_1@monodll_data.o: $(srcdir)/src/mgl/data.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_data.o: $(srcdir)/src/motif/data.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_data.o: $(srcdir)/src/os2/data.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_USE_GUI_1@monodll_datacmn.o: $(srcdir)/src/common/datacmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dataobj.o: $(srcdir)/src/cocoa/dataobj.mm $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_dataobj.o: $(srcdir)/src/mac/dataobj.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@monodll_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12269,12 +12275,6 @@ monodll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_dataobj.o: $(srcdir)/src/mac/dataobj.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1@monodll_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12299,6 +12299,9 @@ monodll_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_dc.o: $(srcdir)/src/mac/dc.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monodll_dc.o: $(srcdir)/src/gtk/dc.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@monodll_dc.o: $(srcdir)/src/msw/dc.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12308,9 +12311,6 @@ monodll_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@monodll_dc.o: $(srcdir)/src/mgl/dc.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1@monodll_dc.o: $(srcdir)/src/gtk/dc.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dc.o: $(srcdir)/src/motif/dc.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12323,6 +12323,12 @@ monodll_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(MONODLL_ODEP) monodll_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MGL_USE_GUI_1@monodll_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_X11_USE_GUI_1@monodll_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12332,23 +12338,20 @@ monodll_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monodll_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_MGL_USE_GUI_1@monodll_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_X11_USE_GUI_1@monodll_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1@monodll_dcclient.o: $(srcdir)/src/gtk/dcclient.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_dcclient.o: $(srcdir)/src/mac/dcclient.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_GTK_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12356,21 +12359,18 @@ monodll_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MGL_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_dcmemory.o: $(srcdir)/src/mac/dcmemory.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_MGL_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12395,6 +12395,9 @@ monodll_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dcscreen.o: $(srcdir)/src/cocoa/dcscreen.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1@monodll_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12404,14 +12407,14 @@ monodll_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_dcscreen.o: $(srcdir)/src/mac/dcscreen.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - monodll_dde.o: $(srcdir)/src/msw/dde.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/motif/dialog.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/os2/dialog.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/mac/dialog.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12419,11 +12422,8 @@ monodll_dde.o: $(srcdir)/src/msw/dde.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/motif/dialog.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/os2/dialog.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/msw/dialog.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12569,24 +12569,24 @@ monodll_encconv.o: $(srcdir)/src/common/encconv.cpp $(MONODLL_ODEP) monodll_event.o: $(srcdir)/src/common/event.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_X11_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MGL_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_X11_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12665,12 +12665,6 @@ monodll_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@monodll_font.o: $(srcdir)/src/mgl/font.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_font.o: $(srcdir)/src/os2/font.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_font.o: $(srcdir)/src/cocoa/font.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1@monodll_font.o: $(srcdir)/src/msw/font.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12680,12 +12674,18 @@ monodll_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_font.o: $(srcdir)/src/mac/font.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_font.o: $(srcdir)/src/os2/font.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_font.o: $(srcdir)/src/motif/font.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@monodll_font.o: $(srcdir)/src/gtk/font.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_font.o: $(srcdir)/src/cocoa/font.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1@monodll_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12713,6 +12713,9 @@ monodll_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MGL_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12725,9 +12728,6 @@ monodll_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_fontenum.o: $(srcdir)/src/mac/fontenum.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12740,18 +12740,12 @@ monodll_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_fontmap.o: $(srcdir)/src/common/fontmap.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_fontutil.o: $(srcdir)/src/mac/fontutil.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12764,6 +12758,18 @@ monodll_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_fontutil.o: $(srcdir)/src/mac/fontutil.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/motif/frame.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/msw/frame.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/mac/frame.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12773,12 +12779,6 @@ monodll_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/gtk/frame.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/motif/frame.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/msw/frame.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/cocoa/frame.mm $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12800,21 +12800,21 @@ monodll_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp $(MONODLL_ODEP) monodll_ftp.o: $(srcdir)/src/common/ftp.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/gtk/gauge.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/motif/gauge.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monodll_gauge.o: $(srcdir)/src/univ/gauge.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/os2/gauge.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/motif/gauge.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/mac/gauge.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12836,12 +12836,21 @@ monodll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monodll_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/cocoa/gdiobj.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monodll_gdiobj.o: $(srcdir)/src/gtk/gdiobj.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/motif/gdiobj.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@monodll_gdiobj.o: $(srcdir)/src/x11/gdiobj.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/cocoa/gdiobj.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MGL_USE_GUI_1@monodll_gdiobj.o: $(srcdir)/src/mgl/gdiobj.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12851,15 +12860,6 @@ monodll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/mac/gdiobj.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1@monodll_gdiobj.o: $(srcdir)/src/gtk/gdiobj.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/motif/gdiobj.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_USE_GUI_1@monodll_geometry.o: $(srcdir)/src/common/geometry.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12968,8 +12968,11 @@ monodll_htmprint.o: $(srcdir)/src/html/htmprint.cpp $(MONODLL_ODEP) monodll_http.o: $(srcdir)/src/common/http.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/cocoa/icon.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MGL_USE_GUI_1@monodll_icon.o: $(srcdir)/src/mgl/icon.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/motif/icon.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/os2/icon.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12977,21 +12980,18 @@ monodll_http.o: $(srcdir)/src/common/http.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monodll_icon.o: $(srcdir)/src/msw/icon.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/cocoa/icon.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_GTK_USE_GUI_1@monodll_icon.o: $(srcdir)/src/gtk/icon.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@monodll_icon.o: $(srcdir)/src/x11/icon.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/mac/icon.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MGL_USE_GUI_1@monodll_icon.o: $(srcdir)/src/mgl/icon.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/motif/icon.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@monodll_icon.o: $(srcdir)/src/gtk/icon.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_USE_GUI_1@monodll_iconbndl.o: $(srcdir)/src/common/iconbndl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13106,24 +13106,24 @@ monodll_list.o: $(srcdir)/src/common/list.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_listbkg.o: $(srcdir)/src/generic/listbkg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/msw/listbox.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_USE_GUI_1_WXUNIV_1@monodll_listbox.o: $(srcdir)/src/univ/listbox.cpp $(MONODLL_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/os2/listbox.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/motif/listbox.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_USE_GUI_1_WXUNIV_1@monodll_listbox.o: $(srcdir)/src/univ/listbox.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/msw/listbox.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/mac/listbox.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13187,14 +13187,8 @@ monodll_m_style.o: $(srcdir)/src/html/m_style.cpp $(MONODLL_ODEP) monodll_m_tables.o: $(srcdir)/src/html/m_tables.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -monodll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_main.o: $(srcdir)/src/cocoa/main.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@monodll_main.o: $(srcdir)/src/gtk/main.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_main.o: $(srcdir)/src/os2/main.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13202,9 +13196,15 @@ monodll_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_main.o: $(srcdir)/src/motif/main.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monodll_main.o: $(srcdir)/src/gtk/main.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@monodll_main.o: $(srcdir)/src/x11/main.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_main.o: $(srcdir)/src/cocoa/main.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_PLATFORM_WIN32_1@monodll_main.o: $(srcdir)/src/msw/main.cpp $(MONODLL_ODEP) @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13244,15 +13244,15 @@ monodll_memory.o: $(srcdir)/src/common/memory.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/motif/menu.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/gtk/menu.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/mac/menu.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/os2/menu.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/gtk/menu.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/msw/menu.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13442,12 +13442,18 @@ monodll_object.o: $(srcdir)/src/common/object.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_paper.o: $(srcdir)/src/common/paper.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_pen.o: $(srcdir)/src/os2/pen.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@monodll_pen.o: $(srcdir)/src/msw/pen.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_pen.o: $(srcdir)/src/mac/pen.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monodll_pen.o: $(srcdir)/src/gtk/pen.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_pen.o: $(srcdir)/src/x11/pen.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13460,12 +13466,6 @@ monodll_object.o: $(srcdir)/src/common/object.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_pen.o: $(srcdir)/src/cocoa/pen.mm $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_pen.o: $(srcdir)/src/os2/pen.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@monodll_pen.o: $(srcdir)/src/gtk/pen.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - monodll_pnghand.o: $(srcdir)/src/mac/pnghand.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13556,24 +13556,24 @@ monodll_protocol.o: $(srcdir)/src/common/protocol.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_radiobox.o: $(srcdir)/src/cocoa/radiobox.mm $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_USE_GUI_1_WXUNIV_1@monodll_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_USE_GUI_1_WXUNIV_1@monodll_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(MONODLL_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/mac/radiobut.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13586,6 +13586,9 @@ monodll_regconf.o: $(srcdir)/src/msw/regconf.cpp $(MONODLL_ODEP) monodll_regex.o: $(srcdir)/src/common/regex.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monodll_region.o: $(srcdir)/src/gtk/region.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_region.o: $(srcdir)/src/x11/region.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13598,18 +13601,15 @@ monodll_regex.o: $(srcdir)/src/common/regex.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@monodll_region.o: $(srcdir)/src/mgl/region.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_region.o: $(srcdir)/src/mac/region.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@monodll_region.o: $(srcdir)/src/gtk/region.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1@monodll_region.o: $(srcdir)/src/msw/region.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_region.o: $(srcdir)/src/os2/region.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_region.o: $(srcdir)/src/mac/region.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + monodll_registry.o: $(srcdir)/src/msw/registry.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13658,9 +13658,6 @@ monodll_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/mac/scrolbar.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_USE_GUI_1_WXUNIV_1@monodll_scrolbar.o: $(srcdir)/src/univ/scrolbar.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13670,6 +13667,9 @@ monodll_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/gtk/scrolbar.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13685,21 +13685,21 @@ monodll_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@monodll_settings.o: $(srcdir)/src/msw/settings.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/motif/settings.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/os2/settings.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@monodll_settings.o: $(srcdir)/src/msw/settings.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/cocoa/settings.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@monodll_settings.o: $(srcdir)/src/gtk/settings.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/motif/settings.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@monodll_settings.o: $(srcdir)/src/x11/settings.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13712,6 +13712,12 @@ monodll_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_USE_GUI_1_WXUNIV_1@monodll_slider.o: $(srcdir)/src/univ/slider.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/cocoa/slider.mm $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/gtk/slider.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13721,12 +13727,6 @@ monodll_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/os2/slider.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1_WXUNIV_1@monodll_slider.o: $(srcdir)/src/univ/slider.cpp $(MONODLL_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/cocoa/slider.mm $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/motif/slider.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13754,9 +13754,6 @@ monodll_socket.o: $(srcdir)/src/common/socket.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1_WXUNIV_1@monodll_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(MONODLL_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/gtk/spinbutt.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13772,6 +13769,9 @@ monodll_socket.o: $(srcdir)/src/common/socket.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_USE_GUI_1_WXUNIV_1@monodll_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1@monodll_spinctlg.o: $(srcdir)/src/generic/spinctlg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13793,6 +13793,12 @@ monodll_splash.o: $(srcdir)/src/generic/splash.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13802,27 +13808,18 @@ monodll_splash.o: $(srcdir)/src/generic/splash.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@monodll_statbmp.o: $(srcdir)/src/univ/statbmp.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/mac/statbmp.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/cocoa/statbmp.mm $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/os2/statbox.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/mac/statbmp.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/mac/statbox.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/os2/statbox.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/motif/statbox.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13832,6 +13829,9 @@ monodll_splash.o: $(srcdir)/src/generic/splash.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@monodll_statbox.o: $(srcdir)/src/univ/statbox.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/msw/statbox.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13865,21 +13865,21 @@ monodll_statlmac.o: $(srcdir)/src/mac/statlmac.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/mac/stattext.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/motif/stattext.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/cocoa/stattext.mm $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/os2/stattext.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/motif/stattext.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/msw/stattext.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monodll_stattext.o: $(srcdir)/src/univ/stattext.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13985,20 +13985,20 @@ monodll_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_USE_GUI_1_WXUNIV_1@monodll_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/mac/textctrl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -14036,9 +14036,6 @@ monodll_theme.o: $(srcdir)/src/univ/theme.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monodll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_timer.o: $(srcdir)/src/mac/timer.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1@monodll_timer.o: $(srcdir)/src/msw/timer.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -14051,6 +14048,9 @@ monodll_theme.o: $(srcdir)/src/univ/theme.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@monodll_timer.o: $(srcdir)/src/generic/timer.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_timer.o: $(srcdir)/src/mac/timer.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_timer.o: $(srcdir)/src/os2/timer.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -14096,21 +14096,21 @@ monodll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monodll_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@monodll_toplevel.o: $(srcdir)/src/x11/toplevel.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@monodll_toplevel.o: $(srcdir)/src/gtk/toplevel.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_toplevel.o: $(srcdir)/src/mac/toplevel.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -14147,27 +14147,27 @@ monodll_unzip.o: $(srcdir)/src/common/unzip.c $(MONODLL_ODEP) monodll_url.o: $(srcdir)/src/common/url.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_utils.o: $(srcdir)/src/cocoa/utils.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_PLATFORM_OS2_1@monodll_utils.o: $(srcdir)/src/os2/utils.cpp $(MONODLL_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_PLATFORM_WIN32_1@monodll_utils.o: $(srcdir)/src/msw/utils.cpp $(MONODLL_ODEP) -@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MGL_USE_GUI_1@monodll_utils.o: $(srcdir)/src/mgl/utils.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_utils.o: $(srcdir)/src/motif/utils.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monodll_utils.o: $(srcdir)/src/os2/utils.cpp $(MONODLL_ODEP) +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@monodll_utils.o: $(srcdir)/src/x11/utils.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_MAC@monodll_utils.o: $(srcdir)/src/mac/utils.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_utils.o: $(srcdir)/src/cocoa/utils.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_PLATFORM_WIN32_1@monodll_utils.o: $(srcdir)/src/msw/utils.cpp $(MONODLL_ODEP) +@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + monodll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -14276,15 +14276,15 @@ monodll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@monodll_window.o: $(srcdir)/src/gtk/window.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@monodll_window.o: $(srcdir)/src/msw/window.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_window.o: $(srcdir)/src/cocoa/window.mm $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@monodll_window.o: $(srcdir)/src/x11/window.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@monodll_window.o: $(srcdir)/src/msw/window.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_window.o: $(srcdir)/src/os2/window.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -14398,27 +14398,27 @@ monolib_access.o: $(srcdir)/src/msw/ole/access.cpp $(MONOLIB_ODEP) monolib_aga.o: $(srcdir)/src/mac/aga.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@monolib_app.o: $(srcdir)/src/msw/app.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@monolib_app.o: $(srcdir)/src/gtk/app.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_app.o: $(srcdir)/src/motif/app.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_MGL_USE_GUI_1@monolib_app.o: $(srcdir)/src/mgl/app.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_app.o: $(srcdir)/src/cocoa/app.mm $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_MSW_USE_GUI_1@monolib_app.o: $(srcdir)/src/msw/app.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_app.o: $(srcdir)/src/os2/app.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_app.o: $(srcdir)/src/cocoa/app.mm $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monolib_app.o: $(srcdir)/src/gtk/app.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_app.o: $(srcdir)/src/mac/app.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_app.o: $(srcdir)/src/motif/app.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@monolib_app.o: $(srcdir)/src/x11/app.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14452,18 +14452,12 @@ monolib_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monolib_baseunix.o: $(srcdir)/src/unix/baseunix.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_MGL_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14476,27 +14470,33 @@ monolib_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_bitmap.o: $(srcdir)/src/mac/bitmap.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1@monolib_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/cocoa/bmpbuttn.mm $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_USE_GUI_1_WXUNIV_1@monolib_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/mac/bmpbuttn.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14518,15 +14518,15 @@ monolib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_brush.o: $(srcdir)/src/cocoa/brush.mm $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MGL_USE_GUI_1@monolib_brush.o: $(srcdir)/src/mgl/brush.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_brush.o: $(srcdir)/src/x11/brush.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@monolib_brush.o: $(srcdir)/src/x11/brush.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MGL_USE_GUI_1@monolib_brush.o: $(srcdir)/src/mgl/brush.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_brush.o: $(srcdir)/src/mac/brush.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14542,14 +14542,14 @@ monolib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/motif/button.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_USE_GUI_1_WXUNIV_1@monolib_button.o: $(srcdir)/src/univ/button.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/cocoa/button.mm $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/gtk/button.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_USE_GUI_1_WXUNIV_1@monolib_button.o: $(srcdir)/src/univ/button.cpp $(MONOLIB_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/gtk/button.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/mac/button.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14584,15 +14584,15 @@ monolib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/cocoa/checkbox.mm $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/mac/checkbox.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14608,6 +14608,9 @@ monolib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/os2/checklst.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_USE_GUI_1_WXUNIV_1@monolib_checklst.o: $(srcdir)/src/univ/checklst.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/gtk/checklst.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14617,9 +14620,6 @@ monolib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/msw/checklst.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1_WXUNIV_1@monolib_checklst.o: $(srcdir)/src/univ/checklst.cpp $(MONOLIB_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/cocoa/checklst.mm $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14638,22 +14638,25 @@ monolib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/os2/choice.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/motif/choice.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/mac/choice.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/gtk/choice.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/msw/choice.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/cocoa/choice.mm $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monolib_choice.o: $(srcdir)/src/univ/choice.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/motif/choice.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/gtk/choice.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/cocoa/choice.mm $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1@monolib_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(MONOLIB_ODEP) @@ -14662,18 +14665,15 @@ monolib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@monolib_clipbrd.o: $(srcdir)/src/gtk/clipbrd.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_clipbrd.o: $(srcdir)/src/mac/clipbrd.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@monolib_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_clipbrd.o: $(srcdir)/src/mac/clipbrd.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_MGL_USE_GUI_1@monolib_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14701,6 +14701,9 @@ monolib_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_colordlg.o: $(srcdir)/src/mac/colordlg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MGL_USE_GUI_1@monolib_colour.o: $(srcdir)/src/mgl/colour.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@monolib_colour.o: $(srcdir)/src/x11/colour.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14710,21 +14713,18 @@ monolib_cmdline.o: $(srcdir)/src/common/cmdline.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_colour.o: $(srcdir)/src/mac/colour.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_colour.o: $(srcdir)/src/cocoa/colour.mm $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_colour.o: $(srcdir)/src/motif/colour.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_MGL_USE_GUI_1@monolib_colour.o: $(srcdir)/src/mgl/colour.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1@monolib_colour.o: $(srcdir)/src/gtk/colour.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_colour.o: $(srcdir)/src/cocoa/colour.mm $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@monolib_colour.o: $(srcdir)/src/msw/colour.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_colour.o: $(srcdir)/src/motif/colour.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14746,12 +14746,12 @@ monolib_colschem.o: $(srcdir)/src/univ/colschem.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/os2/combobox.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/motif/combobox.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_USE_GUI_1_WXUNIV_1@monolib_combobox.o: $(srcdir)/src/univ/combobox.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/motif/combobox.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/mac/combobox.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14776,6 +14776,9 @@ monolib_config.o: $(srcdir)/src/common/config.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/gtk/control.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/cocoa/control.mm $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/mac/control.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14788,9 +14791,6 @@ monolib_config.o: $(srcdir)/src/common/config.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/msw/control.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/cocoa/control.mm $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/os2/control.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14809,21 +14809,21 @@ monolib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_cursor.o: $(srcdir)/src/motif/cursor.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_X11_USE_GUI_1@monolib_cursor.o: $(srcdir)/src/x11/cursor.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_MGL_USE_GUI_1@monolib_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_cursor.o: $(srcdir)/src/motif/cursor.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@monolib_cursor.o: $(srcdir)/src/msw/cursor.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_cursor.o: $(srcdir)/src/os2/cursor.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_X11_USE_GUI_1@monolib_cursor.o: $(srcdir)/src/x11/cursor.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_cursor.o: $(srcdir)/src/cocoa/cursor.mm $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14833,8 +14833,11 @@ monolib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_cursor.o: $(srcdir)/src/mac/cursor.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_data.o: $(srcdir)/src/cocoa/data.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_data.o: $(srcdir)/src/motif/data.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_data.o: $(srcdir)/src/os2/data.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@monolib_data.o: $(srcdir)/src/x11/data.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14848,21 +14851,24 @@ monolib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_data.o: $(srcdir)/src/mac/data.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_data.o: $(srcdir)/src/cocoa/data.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MGL_USE_GUI_1@monolib_data.o: $(srcdir)/src/mgl/data.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_data.o: $(srcdir)/src/motif/data.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_data.o: $(srcdir)/src/os2/data.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_USE_GUI_1@monolib_datacmn.o: $(srcdir)/src/common/datacmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dataobj.o: $(srcdir)/src/cocoa/dataobj.mm $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_dataobj.o: $(srcdir)/src/mac/dataobj.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@monolib_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14872,12 +14878,6 @@ monolib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_dataobj.o: $(srcdir)/src/mac/dataobj.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1@monolib_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14902,6 +14902,9 @@ monolib_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_dc.o: $(srcdir)/src/mac/dc.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monolib_dc.o: $(srcdir)/src/gtk/dc.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@monolib_dc.o: $(srcdir)/src/msw/dc.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14911,9 +14914,6 @@ monolib_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@monolib_dc.o: $(srcdir)/src/mgl/dc.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1@monolib_dc.o: $(srcdir)/src/gtk/dc.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dc.o: $(srcdir)/src/motif/dc.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14926,6 +14926,12 @@ monolib_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(MONOLIB_ODEP) monolib_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MGL_USE_GUI_1@monolib_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_X11_USE_GUI_1@monolib_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14935,23 +14941,20 @@ monolib_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monolib_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_MGL_USE_GUI_1@monolib_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_X11_USE_GUI_1@monolib_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1@monolib_dcclient.o: $(srcdir)/src/gtk/dcclient.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_dcclient.o: $(srcdir)/src/mac/dcclient.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_GTK_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14959,21 +14962,18 @@ monolib_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MGL_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_dcmemory.o: $(srcdir)/src/mac/dcmemory.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_MGL_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14998,6 +14998,9 @@ monolib_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dcscreen.o: $(srcdir)/src/cocoa/dcscreen.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1@monolib_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15007,14 +15010,14 @@ monolib_dcbuffer.o: $(srcdir)/src/generic/dcbuffer.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_dcscreen.o: $(srcdir)/src/mac/dcscreen.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - monolib_dde.o: $(srcdir)/src/msw/dde.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/motif/dialog.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/os2/dialog.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/mac/dialog.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15022,11 +15025,8 @@ monolib_dde.o: $(srcdir)/src/msw/dde.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/motif/dialog.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/os2/dialog.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/msw/dialog.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15172,24 +15172,24 @@ monolib_encconv.o: $(srcdir)/src/common/encconv.cpp $(MONOLIB_ODEP) monolib_event.o: $(srcdir)/src/common/event.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_X11_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MGL_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_X11_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15268,12 +15268,6 @@ monolib_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@monolib_font.o: $(srcdir)/src/mgl/font.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_font.o: $(srcdir)/src/os2/font.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_font.o: $(srcdir)/src/cocoa/font.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1@monolib_font.o: $(srcdir)/src/msw/font.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15283,12 +15277,18 @@ monolib_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_font.o: $(srcdir)/src/mac/font.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_font.o: $(srcdir)/src/os2/font.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_font.o: $(srcdir)/src/motif/font.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@monolib_font.o: $(srcdir)/src/gtk/font.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_font.o: $(srcdir)/src/cocoa/font.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1@monolib_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15316,6 +15316,9 @@ monolib_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MGL_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15328,9 +15331,6 @@ monolib_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_fontenum.o: $(srcdir)/src/mac/fontenum.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15343,18 +15343,12 @@ monolib_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_fontmap.o: $(srcdir)/src/common/fontmap.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_fontutil.o: $(srcdir)/src/mac/fontutil.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15367,6 +15361,18 @@ monolib_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_fontutil.o: $(srcdir)/src/mac/fontutil.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/motif/frame.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/msw/frame.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/mac/frame.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15376,12 +15382,6 @@ monolib_fmapbase.o: $(srcdir)/src/common/fmapbase.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/gtk/frame.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/motif/frame.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/msw/frame.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/cocoa/frame.mm $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15403,20 +15403,20 @@ monolib_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp $(MONOLIB_ODEP) monolib_ftp.o: $(srcdir)/src/common/ftp.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/gtk/gauge.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/motif/gauge.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monolib_gauge.o: $(srcdir)/src/univ/gauge.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/os2/gauge.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/motif/gauge.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/os2/gauge.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/mac/gauge.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15439,12 +15439,21 @@ monolib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monolib_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/cocoa/gdiobj.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monolib_gdiobj.o: $(srcdir)/src/gtk/gdiobj.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/motif/gdiobj.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@monolib_gdiobj.o: $(srcdir)/src/x11/gdiobj.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/cocoa/gdiobj.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MGL_USE_GUI_1@monolib_gdiobj.o: $(srcdir)/src/mgl/gdiobj.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15454,15 +15463,6 @@ monolib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/mac/gdiobj.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1@monolib_gdiobj.o: $(srcdir)/src/gtk/gdiobj.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/motif/gdiobj.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_USE_GUI_1@monolib_geometry.o: $(srcdir)/src/common/geometry.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15571,8 +15571,11 @@ monolib_htmprint.o: $(srcdir)/src/html/htmprint.cpp $(MONOLIB_ODEP) monolib_http.o: $(srcdir)/src/common/http.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/cocoa/icon.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MGL_USE_GUI_1@monolib_icon.o: $(srcdir)/src/mgl/icon.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/motif/icon.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/os2/icon.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15580,21 +15583,18 @@ monolib_http.o: $(srcdir)/src/common/http.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monolib_icon.o: $(srcdir)/src/msw/icon.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/cocoa/icon.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_GTK_USE_GUI_1@monolib_icon.o: $(srcdir)/src/gtk/icon.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@monolib_icon.o: $(srcdir)/src/x11/icon.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/mac/icon.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MGL_USE_GUI_1@monolib_icon.o: $(srcdir)/src/mgl/icon.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/motif/icon.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@monolib_icon.o: $(srcdir)/src/gtk/icon.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_USE_GUI_1@monolib_iconbndl.o: $(srcdir)/src/common/iconbndl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15709,24 +15709,24 @@ monolib_list.o: $(srcdir)/src/common/list.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_listbkg.o: $(srcdir)/src/generic/listbkg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/msw/listbox.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_USE_GUI_1_WXUNIV_1@monolib_listbox.o: $(srcdir)/src/univ/listbox.cpp $(MONOLIB_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/os2/listbox.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/motif/listbox.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_USE_GUI_1_WXUNIV_1@monolib_listbox.o: $(srcdir)/src/univ/listbox.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/msw/listbox.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/mac/listbox.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15793,21 +15793,21 @@ monolib_m_tables.o: $(srcdir)/src/html/m_tables.cpp $(MONOLIB_ODEP) monolib_macnotfy.o: $(srcdir)/src/mac/macnotfy.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_main.o: $(srcdir)/src/cocoa/main.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@monolib_main.o: $(srcdir)/src/gtk/main.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_main.o: $(srcdir)/src/os2/main.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_main.o: $(srcdir)/src/motif/main.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monolib_main.o: $(srcdir)/src/gtk/main.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@monolib_main.o: $(srcdir)/src/x11/main.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_main.o: $(srcdir)/src/cocoa/main.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_PLATFORM_WIN32_1@monolib_main.o: $(srcdir)/src/msw/main.cpp $(MONOLIB_ODEP) @COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15847,15 +15847,15 @@ monolib_memory.o: $(srcdir)/src/common/memory.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/motif/menu.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/gtk/menu.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/mac/menu.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/os2/menu.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/gtk/menu.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/msw/menu.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16045,12 +16045,18 @@ monolib_object.o: $(srcdir)/src/common/object.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_paper.o: $(srcdir)/src/common/paper.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_pen.o: $(srcdir)/src/os2/pen.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1@monolib_pen.o: $(srcdir)/src/msw/pen.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_pen.o: $(srcdir)/src/mac/pen.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monolib_pen.o: $(srcdir)/src/gtk/pen.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_pen.o: $(srcdir)/src/x11/pen.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16063,12 +16069,6 @@ monolib_object.o: $(srcdir)/src/common/object.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_pen.o: $(srcdir)/src/cocoa/pen.mm $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_pen.o: $(srcdir)/src/os2/pen.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@monolib_pen.o: $(srcdir)/src/gtk/pen.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - monolib_pnghand.o: $(srcdir)/src/mac/pnghand.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16159,24 +16159,24 @@ monolib_protocol.o: $(srcdir)/src/common/protocol.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_radiobox.o: $(srcdir)/src/cocoa/radiobox.mm $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_USE_GUI_1_WXUNIV_1@monolib_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_USE_GUI_1_WXUNIV_1@monolib_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(MONOLIB_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/mac/radiobut.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16189,6 +16189,9 @@ monolib_regconf.o: $(srcdir)/src/msw/regconf.cpp $(MONOLIB_ODEP) monolib_regex.o: $(srcdir)/src/common/regex.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monolib_region.o: $(srcdir)/src/gtk/region.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_region.o: $(srcdir)/src/x11/region.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16201,18 +16204,15 @@ monolib_regex.o: $(srcdir)/src/common/regex.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@monolib_region.o: $(srcdir)/src/mgl/region.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_region.o: $(srcdir)/src/mac/region.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1@monolib_region.o: $(srcdir)/src/gtk/region.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1@monolib_region.o: $(srcdir)/src/msw/region.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_region.o: $(srcdir)/src/os2/region.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_region.o: $(srcdir)/src/mac/region.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + monolib_registry.o: $(srcdir)/src/msw/registry.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16261,9 +16261,6 @@ monolib_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/mac/scrolbar.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_USE_GUI_1_WXUNIV_1@monolib_scrolbar.o: $(srcdir)/src/univ/scrolbar.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16273,6 +16270,9 @@ monolib_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/gtk/scrolbar.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16288,21 +16288,21 @@ monolib_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@monolib_settings.o: $(srcdir)/src/msw/settings.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/motif/settings.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/os2/settings.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@monolib_settings.o: $(srcdir)/src/msw/settings.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/cocoa/settings.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@monolib_settings.o: $(srcdir)/src/gtk/settings.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/motif/settings.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@monolib_settings.o: $(srcdir)/src/x11/settings.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16315,6 +16315,12 @@ monolib_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_USE_GUI_1_WXUNIV_1@monolib_slider.o: $(srcdir)/src/univ/slider.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/cocoa/slider.mm $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/gtk/slider.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16324,12 +16330,6 @@ monolib_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/os2/slider.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1_WXUNIV_1@monolib_slider.o: $(srcdir)/src/univ/slider.cpp $(MONOLIB_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/cocoa/slider.mm $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/motif/slider.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16357,9 +16357,6 @@ monolib_socket.o: $(srcdir)/src/common/socket.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1_WXUNIV_1@monolib_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(MONOLIB_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/gtk/spinbutt.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16375,6 +16372,9 @@ monolib_socket.o: $(srcdir)/src/common/socket.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_USE_GUI_1_WXUNIV_1@monolib_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1@monolib_spinctlg.o: $(srcdir)/src/generic/spinctlg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16396,6 +16396,12 @@ monolib_splash.o: $(srcdir)/src/generic/splash.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16405,27 +16411,18 @@ monolib_splash.o: $(srcdir)/src/generic/splash.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@monolib_statbmp.o: $(srcdir)/src/univ/statbmp.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/mac/statbmp.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/cocoa/statbmp.mm $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/os2/statbox.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/mac/statbmp.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/mac/statbox.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/os2/statbox.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/motif/statbox.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16435,6 +16432,9 @@ monolib_splash.o: $(srcdir)/src/generic/splash.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@monolib_statbox.o: $(srcdir)/src/univ/statbox.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/msw/statbox.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16468,21 +16468,21 @@ monolib_statlmac.o: $(srcdir)/src/mac/statlmac.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/mac/stattext.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/motif/stattext.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/cocoa/stattext.mm $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/os2/stattext.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/motif/stattext.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/msw/stattext.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monolib_stattext.o: $(srcdir)/src/univ/stattext.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16588,20 +16588,20 @@ monolib_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_USE_GUI_1_WXUNIV_1@monolib_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/mac/textctrl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16639,9 +16639,6 @@ monolib_theme.o: $(srcdir)/src/univ/theme.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monolib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_timer.o: $(srcdir)/src/mac/timer.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1@monolib_timer.o: $(srcdir)/src/msw/timer.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16654,6 +16651,9 @@ monolib_theme.o: $(srcdir)/src/univ/theme.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@monolib_timer.o: $(srcdir)/src/generic/timer.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_timer.o: $(srcdir)/src/mac/timer.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_timer.o: $(srcdir)/src/os2/timer.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16699,21 +16699,21 @@ monolib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monolib_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@monolib_toplevel.o: $(srcdir)/src/x11/toplevel.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_GTK_USE_GUI_1@monolib_toplevel.o: $(srcdir)/src/gtk/toplevel.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_toplevel.o: $(srcdir)/src/mac/toplevel.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16750,27 +16750,27 @@ monolib_unzip.o: $(srcdir)/src/common/unzip.c $(MONOLIB_ODEP) monolib_url.o: $(srcdir)/src/common/url.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_utils.o: $(srcdir)/src/cocoa/utils.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_PLATFORM_OS2_1@monolib_utils.o: $(srcdir)/src/os2/utils.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_PLATFORM_WIN32_1@monolib_utils.o: $(srcdir)/src/msw/utils.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_MGL_USE_GUI_1@monolib_utils.o: $(srcdir)/src/mgl/utils.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_utils.o: $(srcdir)/src/motif/utils.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_PLATFORM_OS2_1@monolib_utils.o: $(srcdir)/src/os2/utils.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_X11_USE_GUI_1@monolib_utils.o: $(srcdir)/src/x11/utils.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_MAC@monolib_utils.o: $(srcdir)/src/mac/utils.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_utils.o: $(srcdir)/src/cocoa/utils.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_PLATFORM_WIN32_1@monolib_utils.o: $(srcdir)/src/msw/utils.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + monolib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16879,15 +16879,15 @@ monolib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@monolib_window.o: $(srcdir)/src/gtk/window.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@monolib_window.o: $(srcdir)/src/msw/window.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_window.o: $(srcdir)/src/cocoa/window.mm $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @COND_TOOLKIT_X11_USE_GUI_1@monolib_window.o: $(srcdir)/src/x11/window.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MSW_USE_GUI_1@monolib_window.o: $(srcdir)/src/msw/window.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_window.o: $(srcdir)/src/os2/window.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp index 0ba9858..9f03fdc 100644 --- a/build/msw/wx_adv.dsp +++ b/build/msw/wx_adv.dsp @@ -65,8 +65,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_adv.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_adv.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_adv.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_adv.lib" !ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug" @@ -90,8 +90,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_adv.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_adv.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_adv.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_adv.lib" /debug !ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release" @@ -115,8 +115,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_adv.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_adv.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_adv.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_adv.lib" !ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug" @@ -140,8 +140,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_adv.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_adv.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_adv.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_adv.lib" /debug !ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release" @@ -165,8 +165,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_adv.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_adv.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_adv.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_adv.lib" !ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug" @@ -190,8 +190,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_adv.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_adv.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_adv.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_adv.lib" /debug !ELSEIF "$(CFG)" == "adv - Win32 DLL Release" @@ -215,8 +215,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_adv.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_adv.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_adv.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_adv.lib" !ELSEIF "$(CFG)" == "adv - Win32 DLL Debug" @@ -240,8 +240,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_adv.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_adv.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_adv.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_adv.lib" /debug !ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release" diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp index 98c2400..0cab6ee 100644 --- a/build/msw/wx_base.dsp +++ b/build/msw/wx_base.dsp @@ -65,8 +65,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u.lib" !ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Debug" @@ -90,8 +90,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud.lib" /debug !ELSEIF "$(CFG)" == "base - Win32 DLL Universal Release" @@ -115,8 +115,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25.lib" !ELSEIF "$(CFG)" == "base - Win32 DLL Universal Debug" @@ -140,8 +140,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d.lib" /debug !ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Release" @@ -165,8 +165,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u.lib" !ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Debug" @@ -190,8 +190,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud.lib" /debug !ELSEIF "$(CFG)" == "base - Win32 DLL Release" @@ -215,8 +215,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25.lib" !ELSEIF "$(CFG)" == "base - Win32 DLL Debug" @@ -240,8 +240,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d.lib" /debug !ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Release" diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index e3ff0a7..57822ef 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -65,8 +65,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_core.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_core.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_core.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_core.lib" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" @@ -90,8 +90,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_core.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_core.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_core.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_core.lib" /debug !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -115,8 +115,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_core.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_core.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_core.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_core.lib" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" @@ -140,8 +140,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_core.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_core.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_core.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_core.lib" /debug !ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" @@ -165,8 +165,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_core.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_core.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_core.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_core.lib" !ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" @@ -190,8 +190,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_core.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_core.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_core.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_core.lib" /debug !ELSEIF "$(CFG)" == "core - Win32 DLL Release" @@ -215,8 +215,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_core.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_core.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_core.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_core.lib" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" @@ -240,8 +240,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_core.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_core.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_core.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_core.lib" /debug !ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" diff --git a/build/msw/wx_dbgrid.dsp b/build/msw/wx_dbgrid.dsp index 76041c2..1eff6a4 100644 --- a/build/msw/wx_dbgrid.dsp +++ b/build/msw/wx_dbgrid.dsp @@ -65,8 +65,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25u_adv.lib ..\..\lib\vc_dll\wxbase25u_odbc.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_dbgrid.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25u_adv.lib ..\..\lib\vc_dll\wxbase25u_odbc.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_dbgrid.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25u_adv.lib ..\..\lib\vc_dll\wxbase25u_odbc.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_dbgrid.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25u_adv.lib ..\..\lib\vc_dll\wxbase25u_odbc.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_dbgrid.lib" !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug" @@ -90,8 +90,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25ud_adv.lib ..\..\lib\vc_dll\wxbase25ud_odbc.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_dbgrid.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25ud_adv.lib ..\..\lib\vc_dll\wxbase25ud_odbc.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_dbgrid.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25ud_adv.lib ..\..\lib\vc_dll\wxbase25ud_odbc.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_dbgrid.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25ud_adv.lib ..\..\lib\vc_dll\wxbase25ud_odbc.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_dbgrid.lib" /debug !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Release" @@ -115,8 +115,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25_adv.lib ..\..\lib\vc_dll\wxbase25_odbc.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_dbgrid.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25_adv.lib ..\..\lib\vc_dll\wxbase25_odbc.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_dbgrid.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25_adv.lib ..\..\lib\vc_dll\wxbase25_odbc.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_dbgrid.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25_adv.lib ..\..\lib\vc_dll\wxbase25_odbc.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_dbgrid.lib" !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Debug" @@ -140,8 +140,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25d_adv.lib ..\..\lib\vc_dll\wxbase25d_odbc.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_dbgrid.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25d_adv.lib ..\..\lib\vc_dll\wxbase25d_odbc.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_dbgrid.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25d_adv.lib ..\..\lib\vc_dll\wxbase25d_odbc.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_dbgrid.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25d_adv.lib ..\..\lib\vc_dll\wxbase25d_odbc.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_dbgrid.lib" /debug !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Release" @@ -165,8 +165,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25u_adv.lib ..\..\lib\vc_dll\wxbase25u_odbc.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_dbgrid.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25u_adv.lib ..\..\lib\vc_dll\wxbase25u_odbc.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_dbgrid.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25u_adv.lib ..\..\lib\vc_dll\wxbase25u_odbc.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_dbgrid.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25u_adv.lib ..\..\lib\vc_dll\wxbase25u_odbc.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_dbgrid.lib" !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug" @@ -190,8 +190,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25ud_adv.lib ..\..\lib\vc_dll\wxbase25ud_odbc.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_dbgrid.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25ud_adv.lib ..\..\lib\vc_dll\wxbase25ud_odbc.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_dbgrid.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25ud_adv.lib ..\..\lib\vc_dll\wxbase25ud_odbc.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_dbgrid.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25ud_adv.lib ..\..\lib\vc_dll\wxbase25ud_odbc.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_dbgrid.lib" /debug !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Release" @@ -215,8 +215,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25_adv.lib ..\..\lib\vc_dll\wxbase25_odbc.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_dbgrid.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25_adv.lib ..\..\lib\vc_dll\wxbase25_odbc.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_dbgrid.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25_adv.lib ..\..\lib\vc_dll\wxbase25_odbc.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_dbgrid.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25_adv.lib ..\..\lib\vc_dll\wxbase25_odbc.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_dbgrid.lib" !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Debug" @@ -240,8 +240,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25d_adv.lib ..\..\lib\vc_dll\wxbase25d_odbc.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_dbgrid.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25d_adv.lib ..\..\lib\vc_dll\wxbase25d_odbc.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_dbgrid.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25d_adv.lib ..\..\lib\vc_dll\wxbase25d_odbc.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_dbgrid.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25d_adv.lib ..\..\lib\vc_dll\wxbase25d_odbc.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_dbgrid.lib" /debug !ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Release" diff --git a/build/msw/wx_gl.dsp b/build/msw/wx_gl.dsp index 9c6b264..1975e37 100644 --- a/build/msw/wx_gl.dsp +++ b/build/msw/wx_gl.dsp @@ -65,8 +65,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_gl.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_gl.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib wxmswuniv25u_core.lib wxbase25u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_gl.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib wxmswuniv25u_core.lib wxbase25u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_gl.lib" !ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug" @@ -90,8 +90,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_gl.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_gl.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib wxmswuniv25ud_core.lib wxbase25ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_gl.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib wxmswuniv25ud_core.lib wxbase25ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_gl.lib" /debug !ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release" @@ -115,8 +115,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_gl.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_gl.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib wxmswuniv25_core.lib wxbase25.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_gl.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib wxmswuniv25_core.lib wxbase25.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_gl.lib" !ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug" @@ -140,8 +140,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_gl.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_gl.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib wxmswuniv25d_core.lib wxbase25d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_gl.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib wxmswuniv25d_core.lib wxbase25d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_gl.lib" /debug !ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release" @@ -165,8 +165,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_gl.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_gl.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib wxmsw25u_core.lib wxbase25u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_gl.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib wxmsw25u_core.lib wxbase25u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_gl.lib" !ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Debug" @@ -190,8 +190,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_gl.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_gl.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib wxmsw25ud_core.lib wxbase25ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_gl.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib wxmsw25ud_core.lib wxbase25ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_gl.lib" /debug !ELSEIF "$(CFG)" == "gl - Win32 DLL Release" @@ -215,8 +215,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_gl.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_gl.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib wxmsw25_core.lib wxbase25.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_gl.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib wxmsw25_core.lib wxbase25.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_gl.lib" !ELSEIF "$(CFG)" == "gl - Win32 DLL Debug" @@ -240,8 +240,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_gl.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_gl.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib wxmsw25d_core.lib wxbase25d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_gl.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib wxmsw25d_core.lib wxbase25d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_gl.lib" /debug !ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release" diff --git a/build/msw/wx_html.dsp b/build/msw/wx_html.dsp index d96e6ad..13fc1f5 100644 --- a/build/msw/wx_html.dsp +++ b/build/msw/wx_html.dsp @@ -65,8 +65,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_html.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_html.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_html.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_html.lib" !ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Debug" @@ -90,8 +90,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_html.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_html.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_html.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_html.lib" /debug !ELSEIF "$(CFG)" == "html - Win32 DLL Universal Release" @@ -115,8 +115,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_html.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_html.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_html.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_html.lib" !ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug" @@ -140,8 +140,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_html.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_html.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_html.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_html.lib" /debug !ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Release" @@ -165,8 +165,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_html.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_html.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_html.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_html.lib" !ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Debug" @@ -190,8 +190,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_html.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_html.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_html.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_html.lib" /debug !ELSEIF "$(CFG)" == "html - Win32 DLL Release" @@ -215,8 +215,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_html.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_html.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_html.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_html.lib" !ELSEIF "$(CFG)" == "html - Win32 DLL Debug" @@ -240,8 +240,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_html.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_html.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_html.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_html.lib" /debug !ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Release" diff --git a/build/msw/wx_net.dsp b/build/msw/wx_net.dsp index 680e14f..7bdb75b 100644 --- a/build/msw/wx_net.dsp +++ b/build/msw/wx_net.dsp @@ -65,8 +65,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_net.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_net.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_net.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_net.lib" !ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Debug" @@ -90,8 +90,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_net.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_net.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_net.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_net.lib" /debug !ELSEIF "$(CFG)" == "net - Win32 DLL Universal Release" @@ -115,8 +115,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_net.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_net.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_net.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_net.lib" !ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug" @@ -140,8 +140,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_net.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_net.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_net.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_net.lib" /debug !ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Release" @@ -165,8 +165,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_net.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_net.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_net.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_net.lib" !ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Debug" @@ -190,8 +190,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_net.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_net.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_net.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_net.lib" /debug !ELSEIF "$(CFG)" == "net - Win32 DLL Release" @@ -215,8 +215,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_net.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_net.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_net.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_net.lib" !ELSEIF "$(CFG)" == "net - Win32 DLL Debug" @@ -240,8 +240,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_net.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_net.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_net.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_net.lib" /debug !ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Release" diff --git a/build/msw/wx_odbc.dsp b/build/msw/wx_odbc.dsp index 168115e..23db7bb 100644 --- a/build/msw/wx_odbc.dsp +++ b/build/msw/wx_odbc.dsp @@ -65,8 +65,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_odbc.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_odbc.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_odbc.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_odbc.lib" !ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug" @@ -90,8 +90,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_odbc.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_odbc.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_odbc.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_odbc.lib" /debug !ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Release" @@ -115,8 +115,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_odbc.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_odbc.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_odbc.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_odbc.lib" !ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Debug" @@ -140,8 +140,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_odbc.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_odbc.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_odbc.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_odbc.lib" /debug !ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Release" @@ -165,8 +165,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_odbc.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_odbc.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_odbc.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_odbc.lib" !ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Debug" @@ -190,8 +190,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_odbc.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_odbc.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_odbc.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_odbc.lib" /debug !ELSEIF "$(CFG)" == "odbc - Win32 DLL Release" @@ -215,8 +215,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_odbc.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_odbc.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_odbc.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_odbc.lib" !ELSEIF "$(CFG)" == "odbc - Win32 DLL Debug" @@ -240,8 +240,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_odbc.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_odbc.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_odbc.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_odbc.lib" /debug !ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Release" diff --git a/build/msw/wx_xml.dsp b/build/msw/wx_xml.dsp index 1838c2b..15cad3e 100644 --- a/build/msw/wx_xml.dsp +++ b/build/msw/wx_xml.dsp @@ -65,8 +65,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_xml.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_xml.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_xml.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_xml.lib" !ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug" @@ -90,8 +90,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_xml.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_xml.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_xml.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_xml.lib" /debug !ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Release" @@ -115,8 +115,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_xml.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_xml.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_xml.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_xml.lib" !ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Debug" @@ -140,8 +140,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_xml.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_xml.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_xml.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_xml.lib" /debug !ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Release" @@ -165,8 +165,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_xml.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_xml.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_xml.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25u_xml.lib" !ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Debug" @@ -190,8 +190,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_xml.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_xml.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_xml.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25ud_xml.lib" /debug !ELSEIF "$(CFG)" == "xml - Win32 DLL Release" @@ -215,8 +215,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_xml.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_xml.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_xml.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25_xml.lib" !ELSEIF "$(CFG)" == "xml - Win32 DLL Debug" @@ -240,8 +240,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_xml.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_xml.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_xml.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase251d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase25d_xml.lib" /debug !ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Release" diff --git a/contrib/build/animate/makefile.bcc b/contrib/build/animate/makefile.bcc index 5b12b59..621c03a 100644 --- a/contrib/build/animate/makefile.bcc +++ b/contrib/build/animate/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,27 +19,21 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\src\animate\..\..\..\include -I$(SETUPHDIR) \ - -I..\..\src\animate\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_ANIMATE \ - $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_animatedll.csm +ANIMATEDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I$(SETUPHDIR) \ + -I..\..\src\animate\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_ANIMATE -Hu \ + -H=$(OBJS)\wxprec_animatedll.csm $(CPPFLAGS) $(CXXFLAGS) ANIMATEDLL_OBJECTS = \ $(OBJS)\animatedll_dummy.obj \ $(OBJS)\animatedll_animate.obj -ANIMATELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\src\animate\..\..\..\include -I$(SETUPHDIR) \ - -I..\..\src\animate\..\..\include $(CXXFLAGS) -Hu \ - -H=$(OBJS)\wxprec_animatelib.csm +ANIMATELIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I$(SETUPHDIR) \ + -I..\..\src\animate\..\..\include -Hu -H=$(OBJS)\wxprec_animatelib.csm \ + $(CPPFLAGS) $(CXXFLAGS) ANIMATELIB_OBJECTS = \ $(OBJS)\animatelib_dummy.obj \ $(OBJS)\animatelib_animate.obj @@ -175,7 +174,7 @@ $(OBJS)\animatelib_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp !if "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll: $(OBJS)\animatedll_dummy.obj $(ANIMATEDLL_OBJECTS) - ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| c0d32.obj $(ANIMATEDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate $@ @@ -184,7 +183,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animat !if "$(SHARED)" == "0" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib: $(OBJS)\animatelib_dummy.obj $(ANIMATELIB_OBJECTS) if exist $@ del $@ - tlib /a /p2048 $@ @&&| + tlib /a /p4096 $@ @&&| $(ANIMATELIB_OBJECTS) | !endif diff --git a/contrib/build/animate/makefile.gcc b/contrib/build/animate/makefile.gcc index 266a50b..68ff0cd 100644 --- a/contrib/build/animate/makefile.gcc +++ b/contrib/build/animate/makefile.gcc @@ -12,19 +12,19 @@ include ../../../build/msw/config.gcc ### Variables: ### -ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ +ANIMATEDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I$(SETUPHDIR) \ -Wall -I..\..\src\animate\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_ANIMATE \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS) ANIMATEDLL_OBJECTS = \ $(OBJS)\animatedll_dummy.o \ $(OBJS)\animatedll_animate.o -ANIMATELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ +ANIMATELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I$(SETUPHDIR) \ - -Wall -I..\..\src\animate\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_0) + -Wall -I..\..\src\animate\..\..\include $(__EXCEPTIONSFLAG) \ + $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS) ANIMATELIB_OBJECTS = \ $(OBJS)\animatelib_dummy.o \ $(OBJS)\animatelib_animate.o diff --git a/contrib/build/animate/makefile.vc b/contrib/build/animate/makefile.vc index e47469d..f10e70c 100644 --- a/contrib/build/animate/makefile.vc +++ b/contrib/build/animate/makefile.vc @@ -12,26 +12,27 @@ ### Variables: ### -ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_2) \ +ANIMATEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).pdb \ $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\src\animate\..\..\..\include /I$(SETUPHDIR) /W4 \ /I..\..\src\animate\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_ANIMATE \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_animatedll.pch" + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_animatedll.pch" $(CPPFLAGS) $(CXXFLAGS) ANIMATEDLL_OBJECTS = \ $(OBJS)\animatedll_dummy.obj \ $(OBJS)\animatedll_animate.obj -ANIMATELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) \ - /DWIN32 $(__DEBUGINFO_2) \ +ANIMATELIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \ + $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.pdb \ $(____DEBUGRUNTIME_14_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\src\animate\..\..\..\include /I$(SETUPHDIR) /W4 \ - /I..\..\src\animate\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_animatelib.pch" + /I..\..\src\animate\..\..\include $(__EXCEPTIONSFLAG) \ + $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_animatelib.pch" \ + $(CPPFLAGS) $(CXXFLAGS) ANIMATELIB_OBJECTS = \ $(OBJS)\animatelib_dummy.obj \ $(OBJS)\animatelib_animate.obj diff --git a/contrib/build/animate/makefile.wat b/contrib/build/animate/makefile.wat index 983d201..6563ca9 100644 --- a/contrib/build/animate/makefile.wat +++ b/contrib/build/animate/makefile.wat @@ -180,20 +180,20 @@ __animatelib___depname = & ### Variables: ### -ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=..\..\src\animate\..\..\..\include & - -i=$(SETUPHDIR) -i=..\..\src\animate\..\..\include -dWXUSINGDLL & - -dWXMAKINGDLL_ANIMATE $(CXXFLAGS) /fh=$(OBJS)\wxprec_animatedll.pch & - $(__EXCEPTIONSFLAG) +ANIMATEDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=..\..\src\animate\..\..\..\include -i=$(SETUPHDIR) & + -i=..\..\src\animate\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_ANIMATE & + /fh=$(OBJS)\wxprec_animatedll.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) & + $(CXXFLAGS) ANIMATEDLL_OBJECTS = & $(OBJS)\animatedll_dummy.obj & $(OBJS)\animatedll_animate.obj -ANIMATELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=..\..\src\animate\..\..\..\include & - -i=$(SETUPHDIR) -i=..\..\src\animate\..\..\include $(CXXFLAGS) & - /fh=$(OBJS)\wxprec_animatelib.pch $(__EXCEPTIONSFLAG) +ANIMATELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=..\..\src\animate\..\..\..\include -i=$(SETUPHDIR) & + -i=..\..\src\animate\..\..\include /fh=$(OBJS)\wxprec_animatelib.pch & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) ANIMATELIB_OBJECTS = & $(OBJS)\animatelib_dummy.obj & $(OBJS)\animatelib_animate.obj @@ -242,7 +242,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animat $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib : $(ANIMATELIB_OBJECTS) @%create $(OBJS)\animatelib.lbc @for %i in ($(ANIMATELIB_OBJECTS)) do @%append $(OBJS)\animatelib.lbc +%i - wlib -q -p2048 -n -b $^@ @$(OBJS)\animatelib.lbc + wlib -q -p4096 -n -b $^@ @$(OBJS)\animatelib.lbc !endif clean : .SYMBOLIC diff --git a/contrib/build/deprecated/makefile.bcc b/contrib/build/deprecated/makefile.bcc index 00d438a..6ad05e6 100644 --- a/contrib/build/deprecated/makefile.bcc +++ b/contrib/build/deprecated/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,24 +19,19 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -DEPRECATEDDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) \ - -I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \ - -I..\..\src\deprecated $(CFLAGS) -DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) \ - -I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \ - -I..\..\src\deprecated $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_deprecateddll.csm +DEPRECATEDDLL_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \ + -I$(SETUPHDIR) -I..\..\src\deprecated\..\..\include -DWXUSINGDLL \ + -DWXMAKINGDLL_DEPRECATED -I..\..\src\deprecated $(CPPFLAGS) $(CFLAGS) +DEPRECATEDDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \ + -I$(SETUPHDIR) -I..\..\src\deprecated\..\..\include -DWXUSINGDLL \ + -DWXMAKINGDLL_DEPRECATED -I..\..\src\deprecated -Hu \ + -H=$(OBJS)\wxprec_deprecateddll.csm $(CPPFLAGS) $(CXXFLAGS) DEPRECATEDDLL_OBJECTS = \ $(OBJS)\deprecateddll_dummy.obj \ $(OBJS)\deprecateddll_prop.obj \ @@ -42,17 +42,16 @@ DEPRECATEDDLL_OBJECTS = \ $(OBJS)\deprecateddll_treelay.obj \ $(OBJS)\deprecateddll_wxexpr.obj \ $(OBJS)\deprecateddll_dosyacc.obj -DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) \ - -I..\..\src\deprecated\..\..\include -I..\..\src\deprecated $(CFLAGS) -DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) \ - -I..\..\src\deprecated\..\..\include -I..\..\src\deprecated $(CXXFLAGS) -Hu \ - -H=$(OBJS)\wxprec_deprecatedlib.csm +DEPRECATEDLIB_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \ + -I$(SETUPHDIR) -I..\..\src\deprecated\..\..\include -I..\..\src\deprecated \ + $(CPPFLAGS) $(CFLAGS) +DEPRECATEDLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \ + -I$(SETUPHDIR) -I..\..\src\deprecated\..\..\include -I..\..\src\deprecated \ + -Hu -H=$(OBJS)\wxprec_deprecatedlib.csm $(CPPFLAGS) $(CXXFLAGS) DEPRECATEDLIB_OBJECTS = \ $(OBJS)\deprecatedlib_dummy.obj \ $(OBJS)\deprecatedlib_prop.obj \ @@ -254,7 +253,7 @@ clean: !if "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll: $(OBJS)\deprecateddll_dummy.obj $(DEPRECATEDDLL_OBJECTS) - ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| c0d32.obj $(DEPRECATEDDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated $@ @@ -263,7 +262,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprec !if "$(SHARED)" == "0" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib: $(OBJS)\deprecatedlib_dummy.obj $(DEPRECATEDLIB_OBJECTS) if exist $@ del $@ - tlib /a /p2048 $@ @&&| + tlib /a /p4096 $@ @&&| $(DEPRECATEDLIB_OBJECTS) | !endif diff --git a/contrib/build/deprecated/makefile.gcc b/contrib/build/deprecated/makefile.gcc index e151737..f55272a 100644 --- a/contrib/build/deprecated/makefile.gcc +++ b/contrib/build/deprecated/makefile.gcc @@ -12,18 +12,17 @@ include ../../../build/msw/config.gcc ### Variables: ### -DEPRECATEDDLL_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ +DEPRECATEDDLL_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \ -I$(SETUPHDIR) -Wall -I..\..\src\deprecated\..\..\include -DWXUSINGDLL \ - -DWXMAKINGDLL_DEPRECATED -I..\..\src\deprecated $(CFLAGS) -DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) -Wall \ - -I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \ - -I..\..\src\deprecated $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_0) + -DWXMAKINGDLL_DEPRECATED -I..\..\src\deprecated $(CPPFLAGS) $(CFLAGS) +DEPRECATEDDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \ + -I$(SETUPHDIR) -Wall -I..\..\src\deprecated\..\..\include -DWXUSINGDLL \ + -DWXMAKINGDLL_DEPRECATED -I..\..\src\deprecated $(__EXCEPTIONSFLAG) \ + $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS) DEPRECATEDDLL_OBJECTS = \ $(OBJS)\deprecateddll_dummy.o \ $(OBJS)\deprecateddll_prop.o \ @@ -34,17 +33,17 @@ DEPRECATEDDLL_OBJECTS = \ $(OBJS)\deprecateddll_treelay.o \ $(OBJS)\deprecateddll_wxexpr.o \ $(OBJS)\deprecateddll_dosyacc.o -DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ +DEPRECATEDLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \ + -I$(SETUPHDIR) -Wall -I..\..\src\deprecated\..\..\include \ + -I..\..\src\deprecated $(CPPFLAGS) $(CFLAGS) +DEPRECATEDLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \ -I$(SETUPHDIR) -Wall -I..\..\src\deprecated\..\..\include \ - -I..\..\src\deprecated $(CFLAGS) -DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) -Wall \ - -I..\..\src\deprecated\..\..\include -I..\..\src\deprecated $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) + -I..\..\src\deprecated $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \ + $(CPPFLAGS) $(CXXFLAGS) DEPRECATEDLIB_OBJECTS = \ $(OBJS)\deprecatedlib_dummy.o \ $(OBJS)\deprecatedlib_prop.o \ diff --git a/contrib/build/deprecated/makefile.vc b/contrib/build/deprecated/makefile.vc index c221c60..ef4cbac 100644 --- a/contrib/build/deprecated/makefile.vc +++ b/contrib/build/deprecated/makefile.vc @@ -12,24 +12,24 @@ ### Variables: ### -DEPRECATEDDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_2) \ +DEPRECATEDDLL_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).pdb \ $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\src\deprecated\..\..\..\include /I$(SETUPHDIR) /W4 \ /I..\..\src\deprecated\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_DEPRECATED \ - /I..\..\src\deprecated $(CFLAGS) -DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_2) \ + /I..\..\src\deprecated $(CPPFLAGS) $(CFLAGS) +DEPRECATEDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).pdb \ $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\src\deprecated\..\..\..\include /I$(SETUPHDIR) /W4 \ /I..\..\src\deprecated\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_DEPRECATED \ - /I..\..\src\deprecated $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_deprecateddll.pch" + /I..\..\src\deprecated $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_deprecateddll.pch" $(CPPFLAGS) \ + $(CXXFLAGS) DEPRECATEDDLL_OBJECTS = \ $(OBJS)\deprecateddll_dummy.obj \ $(OBJS)\deprecateddll_prop.obj \ @@ -40,22 +40,23 @@ DEPRECATEDDLL_OBJECTS = \ $(OBJS)\deprecateddll_treelay.obj \ $(OBJS)\deprecateddll_wxexpr.obj \ $(OBJS)\deprecateddll_dosyacc.obj -DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) \ - /DWIN32 $(__DEBUGINFO_2) \ +DEPRECATEDLIB_CFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \ + $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.pdb \ $(____DEBUGRUNTIME_14_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\src\deprecated\..\..\..\include /I$(SETUPHDIR) /W4 \ - /I..\..\src\deprecated\..\..\include /I..\..\src\deprecated $(CFLAGS) -DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) \ - /DWIN32 $(__DEBUGINFO_2) \ + /I..\..\src\deprecated\..\..\include /I..\..\src\deprecated $(CPPFLAGS) \ + $(CFLAGS) +DEPRECATEDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \ + $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.pdb \ $(____DEBUGRUNTIME_14_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\src\deprecated\..\..\..\include /I$(SETUPHDIR) /W4 \ - /I..\..\src\deprecated\..\..\include /I..\..\src\deprecated $(CXXFLAGS) \ + /I..\..\src\deprecated\..\..\include /I..\..\src\deprecated \ $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_deprecatedlib.pch" + /Fp"$(OBJS)\wxprec_deprecatedlib.pch" $(CPPFLAGS) $(CXXFLAGS) DEPRECATEDLIB_OBJECTS = \ $(OBJS)\deprecatedlib_dummy.obj \ $(OBJS)\deprecatedlib_prop.obj \ diff --git a/contrib/build/deprecated/makefile.wat b/contrib/build/deprecated/makefile.wat index d33d14c..a2fcf1d 100644 --- a/contrib/build/deprecated/makefile.wat +++ b/contrib/build/deprecated/makefile.wat @@ -180,17 +180,18 @@ __deprecatedlib___depname = & ### Variables: ### -DEPRECATEDDLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & +DEPRECATEDDLL_CFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include & -i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\include -dWXUSINGDLL & - -dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated $(CFLAGS) -DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & + -dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated $(CPPFLAGS) $(CFLAGS) +DEPRECATEDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include & -i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\include -dWXUSINGDLL & - -dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated $(CXXFLAGS) & - /fh=$(OBJS)\wxprec_deprecateddll.pch $(__EXCEPTIONSFLAG) + -dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated & + /fh=$(OBJS)\wxprec_deprecateddll.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) & + $(CXXFLAGS) DEPRECATEDDLL_OBJECTS = & $(OBJS)\deprecateddll_dummy.obj & $(OBJS)\deprecateddll_prop.obj & @@ -201,17 +202,17 @@ DEPRECATEDDLL_OBJECTS = & $(OBJS)\deprecateddll_treelay.obj & $(OBJS)\deprecateddll_wxexpr.obj & $(OBJS)\deprecateddll_dosyacc.obj -DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include & - -i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\include & - -i=..\..\src\deprecated $(CFLAGS) -DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include & - -i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\include & - -i=..\..\src\deprecated $(CXXFLAGS) /fh=$(OBJS)\wxprec_deprecatedlib.pch & - $(__EXCEPTIONSFLAG) +DEPRECATEDLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=..\..\src\deprecated\..\..\..\include -i=$(SETUPHDIR) & + -i=..\..\src\deprecated\..\..\include -i=..\..\src\deprecated $(CPPFLAGS) & + $(CFLAGS) +DEPRECATEDLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=..\..\src\deprecated\..\..\..\include -i=$(SETUPHDIR) & + -i=..\..\src\deprecated\..\..\include -i=..\..\src\deprecated & + /fh=$(OBJS)\wxprec_deprecatedlib.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) & + $(CXXFLAGS) DEPRECATEDLIB_OBJECTS = & $(OBJS)\deprecatedlib_dummy.obj & $(OBJS)\deprecatedlib_prop.obj & @@ -318,5 +319,5 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprec $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib : $(DEPRECATEDLIB_OBJECTS) @%create $(OBJS)\deprecatedlib.lbc @for %i in ($(DEPRECATEDLIB_OBJECTS)) do @%append $(OBJS)\deprecatedlib.lbc +%i - wlib -q -p2048 -n -b $^@ @$(OBJS)\deprecatedlib.lbc + wlib -q -p4096 -n -b $^@ @$(OBJS)\deprecatedlib.lbc !endif diff --git a/contrib/build/fl/makefile.bcc b/contrib/build/fl/makefile.bcc index 2b5881f..2ba3844 100644 --- a/contrib/build/fl/makefile.bcc +++ b/contrib/build/fl/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,17 +19,13 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -FLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include \ - -I$(SETUPHDIR) -I..\..\src\fl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FL \ - $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_fldll.csm +FLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include -I$(SETUPHDIR) \ + -I..\..\src\fl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FL -Hu \ + -H=$(OBJS)\wxprec_fldll.csm $(CPPFLAGS) $(CXXFLAGS) FLDLL_OBJECTS = \ $(OBJS)\fldll_dummy.obj \ $(OBJS)\fldll_antiflickpl.obj \ @@ -44,11 +45,11 @@ FLDLL_OBJECTS = \ $(OBJS)\fldll_rowlayoutpl.obj \ $(OBJS)\fldll_toolwnd.obj \ $(OBJS)\fldll_updatesmgr.obj -FLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include \ - -I$(SETUPHDIR) -I..\..\src\fl\..\..\include $(CXXFLAGS) -Hu \ - -H=$(OBJS)\wxprec_fllib.csm +FLLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include -I$(SETUPHDIR) \ + -I..\..\src\fl\..\..\include -Hu -H=$(OBJS)\wxprec_fllib.csm $(CPPFLAGS) \ + $(CXXFLAGS) FLLIB_OBJECTS = \ $(OBJS)\fllib_dummy.obj \ $(OBJS)\fllib_antiflickpl.obj \ @@ -313,7 +314,7 @@ clean: !if "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll: $(OBJS)\fldll_dummy.obj $(FLDLL_OBJECTS) - ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| c0d32.obj $(FLDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl $@ @@ -322,7 +323,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc !if "$(SHARED)" == "0" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib: $(OBJS)\fllib_dummy.obj $(FLLIB_OBJECTS) if exist $@ del $@ - tlib /a /p2048 $@ @&&| + tlib /a /p4096 $@ @&&| $(FLLIB_OBJECTS) | !endif diff --git a/contrib/build/fl/makefile.gcc b/contrib/build/fl/makefile.gcc index b8d33e5..6274833 100644 --- a/contrib/build/fl/makefile.gcc +++ b/contrib/build/fl/makefile.gcc @@ -12,11 +12,11 @@ include ../../../build/msw/config.gcc ### Variables: ### -FLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include -I$(SETUPHDIR) -Wall \ - -I..\..\src\fl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FL $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) +FLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I..\..\src\fl\..\..\..\include -I$(SETUPHDIR) -Wall \ + -I..\..\src\fl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FL \ + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS) FLDLL_OBJECTS = \ $(OBJS)\fldll_dummy.o \ $(OBJS)\fldll_antiflickpl.o \ @@ -36,11 +36,11 @@ FLDLL_OBJECTS = \ $(OBJS)\fldll_rowlayoutpl.o \ $(OBJS)\fldll_toolwnd.o \ $(OBJS)\fldll_updatesmgr.o -FLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include -I$(SETUPHDIR) -Wall \ - -I..\..\src\fl\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_0) +FLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I..\..\src\fl\..\..\..\include -I$(SETUPHDIR) -Wall \ + -I..\..\src\fl\..\..\include $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \ + $(CPPFLAGS) $(CXXFLAGS) FLLIB_OBJECTS = \ $(OBJS)\fllib_dummy.o \ $(OBJS)\fllib_antiflickpl.o \ diff --git a/contrib/build/fl/makefile.vc b/contrib/build/fl/makefile.vc index f5e2bf6..ef54b3a 100644 --- a/contrib/build/fl/makefile.vc +++ b/contrib/build/fl/makefile.vc @@ -12,15 +12,15 @@ ### Variables: ### -FLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ +FLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).pdb \ $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\src\fl\..\..\..\include /I$(SETUPHDIR) /W4 \ - /I..\..\src\fl\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_FL $(CXXFLAGS) \ + /I..\..\src\fl\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_FL \ $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_fldll.pch" + /Fp"$(OBJS)\wxprec_fldll.pch" $(CPPFLAGS) $(CXXFLAGS) FLDLL_OBJECTS = \ $(OBJS)\fldll_dummy.obj \ $(OBJS)\fldll_antiflickpl.obj \ @@ -40,14 +40,14 @@ FLDLL_OBJECTS = \ $(OBJS)\fldll_rowlayoutpl.obj \ $(OBJS)\fldll_toolwnd.obj \ $(OBJS)\fldll_updatesmgr.obj -FLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \ +FLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \ $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.pdb \ $(____DEBUGRUNTIME_14_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\src\fl\..\..\..\include /I$(SETUPHDIR) /W4 \ - /I..\..\src\fl\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_fllib.pch" + /I..\..\src\fl\..\..\include $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_fllib.pch" $(CPPFLAGS) $(CXXFLAGS) FLLIB_OBJECTS = \ $(OBJS)\fllib_dummy.obj \ $(OBJS)\fllib_antiflickpl.obj \ diff --git a/contrib/build/fl/makefile.wat b/contrib/build/fl/makefile.wat index 88e4318..45ba0f6 100644 --- a/contrib/build/fl/makefile.wat +++ b/contrib/build/fl/makefile.wat @@ -180,11 +180,11 @@ __fllib___depname = & ### Variables: ### -FLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=..\..\src\fl\..\..\..\include -i=$(SETUPHDIR) & - -i=..\..\src\fl\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_FL $(CXXFLAGS) & - /fh=$(OBJS)\wxprec_fldll.pch $(__EXCEPTIONSFLAG) +FLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=..\..\src\fl\..\..\..\include -i=$(SETUPHDIR) & + -i=..\..\src\fl\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_FL & + /fh=$(OBJS)\wxprec_fldll.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) FLDLL_OBJECTS = & $(OBJS)\fldll_dummy.obj & $(OBJS)\fldll_antiflickpl.obj & @@ -204,11 +204,11 @@ FLDLL_OBJECTS = & $(OBJS)\fldll_rowlayoutpl.obj & $(OBJS)\fldll_toolwnd.obj & $(OBJS)\fldll_updatesmgr.obj -FLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=..\..\src\fl\..\..\..\include -i=$(SETUPHDIR) & - -i=..\..\src\fl\..\..\include $(CXXFLAGS) /fh=$(OBJS)\wxprec_fllib.pch & - $(__EXCEPTIONSFLAG) +FLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=..\..\src\fl\..\..\..\include -i=$(SETUPHDIR) & + -i=..\..\src\fl\..\..\include /fh=$(OBJS)\wxprec_fllib.pch & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) FLLIB_OBJECTS = & $(OBJS)\fllib_dummy.obj & $(OBJS)\fllib_antiflickpl.obj & @@ -378,5 +378,5 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_wat $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib : $(FLLIB_OBJECTS) @%create $(OBJS)\fllib.lbc @for %i in ($(FLLIB_OBJECTS)) do @%append $(OBJS)\fllib.lbc +%i - wlib -q -p2048 -n -b $^@ @$(OBJS)\fllib.lbc + wlib -q -p4096 -n -b $^@ @$(OBJS)\fllib.lbc !endif diff --git a/contrib/build/gizmos/makefile.bcc b/contrib/build/gizmos/makefile.bcc index 219de27..be961f4 100644 --- a/contrib/build/gizmos/makefile.bcc +++ b/contrib/build/gizmos/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,18 +19,13 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) \ - -I..\..\src\gizmos\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS \ - $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_gizmosdll.csm +GIZMOSDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) \ + -I..\..\src\gizmos\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS -Hu \ + -H=$(OBJS)\wxprec_gizmosdll.csm $(CPPFLAGS) $(CXXFLAGS) GIZMOSDLL_OBJECTS = \ $(OBJS)\gizmosdll_dummy.obj \ $(OBJS)\gizmosdll_dynamicsash.obj \ @@ -34,12 +34,11 @@ GIZMOSDLL_OBJECTS = \ $(OBJS)\gizmosdll_multicell.obj \ $(OBJS)\gizmosdll_splittree.obj \ $(OBJS)\gizmosdll_statpict.obj -GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) \ - -I..\..\src\gizmos\..\..\include $(CXXFLAGS) -Hu \ - -H=$(OBJS)\wxprec_gizmoslib.csm +GIZMOSLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) \ + -I..\..\src\gizmos\..\..\include -Hu -H=$(OBJS)\wxprec_gizmoslib.csm \ + $(CPPFLAGS) $(CXXFLAGS) GIZMOSLIB_OBJECTS = \ $(OBJS)\gizmoslib_dummy.obj \ $(OBJS)\gizmoslib_dynamicsash.obj \ @@ -227,7 +226,7 @@ clean: !if "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_bcc$(VENDORTAG).dll: $(OBJS)\gizmosdll_dummy.obj $(GIZMOSDLL_OBJECTS) - ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| c0d32.obj $(GIZMOSDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib $(__WXLIB_BASE_p) $(__WXLIB_CORE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos $@ @@ -236,7 +235,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos !if "$(SHARED)" == "0" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib: $(OBJS)\gizmoslib_dummy.obj $(GIZMOSLIB_OBJECTS) if exist $@ del $@ - tlib /a /p2048 $@ @&&| + tlib /a /p4096 $@ @&&| $(GIZMOSLIB_OBJECTS) | !endif diff --git a/contrib/build/gizmos/makefile.gcc b/contrib/build/gizmos/makefile.gcc index e65abbc..a4b3594 100644 --- a/contrib/build/gizmos/makefile.gcc +++ b/contrib/build/gizmos/makefile.gcc @@ -12,11 +12,11 @@ include ../../../build/msw/config.gcc ### Variables: ### -GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ +GIZMOSDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) \ -Wall -I..\..\src\gizmos\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS) GIZMOSDLL_OBJECTS = \ $(OBJS)\gizmosdll_dummy.o \ $(OBJS)\gizmosdll_dynamicsash.o \ @@ -25,11 +25,11 @@ GIZMOSDLL_OBJECTS = \ $(OBJS)\gizmosdll_multicell.o \ $(OBJS)\gizmosdll_splittree.o \ $(OBJS)\gizmosdll_statpict.o -GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ +GIZMOSLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) \ - -Wall -I..\..\src\gizmos\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_0) + -Wall -I..\..\src\gizmos\..\..\include $(__EXCEPTIONSFLAG) \ + $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS) GIZMOSLIB_OBJECTS = \ $(OBJS)\gizmoslib_dummy.o \ $(OBJS)\gizmoslib_dynamicsash.o \ diff --git a/contrib/build/gizmos/makefile.vc b/contrib/build/gizmos/makefile.vc index 984c005..ff98a3e 100644 --- a/contrib/build/gizmos/makefile.vc +++ b/contrib/build/gizmos/makefile.vc @@ -12,15 +12,15 @@ ### Variables: ### -GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_2) \ +GIZMOSDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).pdb \ $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\src\gizmos\..\..\..\include /I$(SETUPHDIR) /W4 \ /I..\..\src\gizmos\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_GIZMOS \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_gizmosdll.pch" + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_gizmosdll.pch" $(CPPFLAGS) $(CXXFLAGS) GIZMOSDLL_OBJECTS = \ $(OBJS)\gizmosdll_dummy.obj \ $(OBJS)\gizmosdll_dynamicsash.obj \ @@ -29,14 +29,14 @@ GIZMOSDLL_OBJECTS = \ $(OBJS)\gizmosdll_multicell.obj \ $(OBJS)\gizmosdll_splittree.obj \ $(OBJS)\gizmosdll_statpict.obj -GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) \ - /DWIN32 $(__DEBUGINFO_2) \ +GIZMOSLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \ + $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.pdb \ $(____DEBUGRUNTIME_14_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\src\gizmos\..\..\..\include /I$(SETUPHDIR) /W4 \ - /I..\..\src\gizmos\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gizmoslib.pch" + /I..\..\src\gizmos\..\..\include $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gizmoslib.pch" $(CPPFLAGS) $(CXXFLAGS) GIZMOSLIB_OBJECTS = \ $(OBJS)\gizmoslib_dummy.obj \ $(OBJS)\gizmoslib_dynamicsash.obj \ diff --git a/contrib/build/gizmos/makefile.wat b/contrib/build/gizmos/makefile.wat index 9d247f9..1913585 100644 --- a/contrib/build/gizmos/makefile.wat +++ b/contrib/build/gizmos/makefile.wat @@ -180,11 +180,12 @@ __gizmoslib___depname = & ### Variables: ### -GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=..\..\src\gizmos\..\..\..\include -i=$(SETUPHDIR) & +GIZMOSDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=..\..\src\gizmos\..\..\..\include -i=$(SETUPHDIR) & -i=..\..\src\gizmos\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_GIZMOS & - $(CXXFLAGS) /fh=$(OBJS)\wxprec_gizmosdll.pch $(__EXCEPTIONSFLAG) + /fh=$(OBJS)\wxprec_gizmosdll.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) & + $(CXXFLAGS) GIZMOSDLL_OBJECTS = & $(OBJS)\gizmosdll_dummy.obj & $(OBJS)\gizmosdll_dynamicsash.obj & @@ -193,11 +194,11 @@ GIZMOSDLL_OBJECTS = & $(OBJS)\gizmosdll_multicell.obj & $(OBJS)\gizmosdll_splittree.obj & $(OBJS)\gizmosdll_statpict.obj -GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=..\..\src\gizmos\..\..\..\include -i=$(SETUPHDIR) & - -i=..\..\src\gizmos\..\..\include $(CXXFLAGS) & - /fh=$(OBJS)\wxprec_gizmoslib.pch $(__EXCEPTIONSFLAG) +GIZMOSLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=..\..\src\gizmos\..\..\..\include -i=$(SETUPHDIR) & + -i=..\..\src\gizmos\..\..\include /fh=$(OBJS)\wxprec_gizmoslib.pch & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) GIZMOSLIB_OBJECTS = & $(OBJS)\gizmoslib_dummy.obj & $(OBJS)\gizmoslib_dynamicsash.obj & @@ -290,5 +291,5 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib : $(GIZMOSLIB_OBJECTS) @%create $(OBJS)\gizmoslib.lbc @for %i in ($(GIZMOSLIB_OBJECTS)) do @%append $(OBJS)\gizmoslib.lbc +%i - wlib -q -p2048 -n -b $^@ @$(OBJS)\gizmoslib.lbc + wlib -q -p4096 -n -b $^@ @$(OBJS)\gizmoslib.lbc !endif diff --git a/contrib/build/mmedia/makefile.bcc b/contrib/build/mmedia/makefile.bcc index d9a3dfa..35a251c 100644 --- a/contrib/build/mmedia/makefile.bcc +++ b/contrib/build/mmedia/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,18 +19,13 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -MMEDIADLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\src\mmedia\..\..\..\include -I$(SETUPHDIR) \ - -I..\..\src\mmedia\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_MMEDIA \ - $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_mmediadll.csm +MMEDIADLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\mmedia\..\..\..\include -I$(SETUPHDIR) \ + -I..\..\src\mmedia\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_MMEDIA -Hu \ + -H=$(OBJS)\wxprec_mmediadll.csm $(CPPFLAGS) $(CXXFLAGS) MMEDIADLL_OBJECTS = \ $(OBJS)\mmediadll_dummy.obj \ $(OBJS)\mmediadll_cdwin.obj \ @@ -48,12 +48,11 @@ MMEDIADLL_OBJECTS = \ $(OBJS)\mmediadll_sndulaw.obj \ $(OBJS)\mmediadll_sndwav.obj \ $(OBJS)\mmediadll_vidbase.obj -MMEDIALIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\src\mmedia\..\..\..\include -I$(SETUPHDIR) \ - -I..\..\src\mmedia\..\..\include $(CXXFLAGS) -Hu \ - -H=$(OBJS)\wxprec_mmedialib.csm +MMEDIALIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\mmedia\..\..\..\include -I$(SETUPHDIR) \ + -I..\..\src\mmedia\..\..\include -Hu -H=$(OBJS)\wxprec_mmedialib.csm \ + $(CPPFLAGS) $(CXXFLAGS) MMEDIALIB_OBJECTS = \ $(OBJS)\mmedialib_dummy.obj \ $(OBJS)\mmedialib_cdwin.obj \ @@ -339,7 +338,7 @@ clean: !if "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_bcc$(VENDORTAG).dll: $(OBJS)\mmediadll_dummy.obj $(MMEDIADLL_OBJECTS) - ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| c0d32.obj $(MMEDIADLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia $@ @@ -348,7 +347,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia !if "$(SHARED)" == "0" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib: $(OBJS)\mmedialib_dummy.obj $(MMEDIALIB_OBJECTS) if exist $@ del $@ - tlib /a /p2048 $@ @&&| + tlib /a /p4096 $@ @&&| $(MMEDIALIB_OBJECTS) | !endif diff --git a/contrib/build/mmedia/makefile.gcc b/contrib/build/mmedia/makefile.gcc index d7f2a79..0c16b8b 100644 --- a/contrib/build/mmedia/makefile.gcc +++ b/contrib/build/mmedia/makefile.gcc @@ -12,11 +12,11 @@ include ../../../build/msw/config.gcc ### Variables: ### -MMEDIADLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ +MMEDIADLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\src\mmedia\..\..\..\include -I$(SETUPHDIR) \ -Wall -I..\..\src\mmedia\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_MMEDIA \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS) MMEDIADLL_OBJECTS = \ $(OBJS)\mmediadll_dummy.o \ $(OBJS)\mmediadll_cdwin.o \ @@ -39,11 +39,11 @@ MMEDIADLL_OBJECTS = \ $(OBJS)\mmediadll_sndulaw.o \ $(OBJS)\mmediadll_sndwav.o \ $(OBJS)\mmediadll_vidbase.o -MMEDIALIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ +MMEDIALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\src\mmedia\..\..\..\include -I$(SETUPHDIR) \ - -Wall -I..\..\src\mmedia\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_0) + -Wall -I..\..\src\mmedia\..\..\include $(__EXCEPTIONSFLAG) \ + $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS) MMEDIALIB_OBJECTS = \ $(OBJS)\mmedialib_dummy.o \ $(OBJS)\mmedialib_cdwin.o \ diff --git a/contrib/build/mmedia/makefile.vc b/contrib/build/mmedia/makefile.vc index bf4be76..e493f41 100644 --- a/contrib/build/mmedia/makefile.vc +++ b/contrib/build/mmedia/makefile.vc @@ -12,15 +12,15 @@ ### Variables: ### -MMEDIADLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_2) \ +MMEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_vc$(VENDORTAG).pdb \ $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\src\mmedia\..\..\..\include /I$(SETUPHDIR) /W4 \ /I..\..\src\mmedia\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_MMEDIA \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_mmediadll.pch" + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_mmediadll.pch" $(CPPFLAGS) $(CXXFLAGS) MMEDIADLL_OBJECTS = \ $(OBJS)\mmediadll_dummy.obj \ $(OBJS)\mmediadll_cdwin.obj \ @@ -43,14 +43,14 @@ MMEDIADLL_OBJECTS = \ $(OBJS)\mmediadll_sndulaw.obj \ $(OBJS)\mmediadll_sndwav.obj \ $(OBJS)\mmediadll_vidbase.obj -MMEDIALIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) \ - /DWIN32 $(__DEBUGINFO_2) \ +MMEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \ + $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.pdb \ $(____DEBUGRUNTIME_14_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\src\mmedia\..\..\..\include /I$(SETUPHDIR) /W4 \ - /I..\..\src\mmedia\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_mmedialib.pch" + /I..\..\src\mmedia\..\..\include $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_mmedialib.pch" $(CPPFLAGS) $(CXXFLAGS) MMEDIALIB_OBJECTS = \ $(OBJS)\mmedialib_dummy.obj \ $(OBJS)\mmedialib_cdwin.obj \ diff --git a/contrib/build/mmedia/makefile.wat b/contrib/build/mmedia/makefile.wat index 4c0e208..916e447 100644 --- a/contrib/build/mmedia/makefile.wat +++ b/contrib/build/mmedia/makefile.wat @@ -180,11 +180,12 @@ __mmedialib___depname = & ### Variables: ### -MMEDIADLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=..\..\src\mmedia\..\..\..\include -i=$(SETUPHDIR) & +MMEDIADLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=..\..\src\mmedia\..\..\..\include -i=$(SETUPHDIR) & -i=..\..\src\mmedia\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_MMEDIA & - $(CXXFLAGS) /fh=$(OBJS)\wxprec_mmediadll.pch $(__EXCEPTIONSFLAG) + /fh=$(OBJS)\wxprec_mmediadll.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) & + $(CXXFLAGS) MMEDIADLL_OBJECTS = & $(OBJS)\mmediadll_dummy.obj & $(OBJS)\mmediadll_cdwin.obj & @@ -207,11 +208,11 @@ MMEDIADLL_OBJECTS = & $(OBJS)\mmediadll_sndulaw.obj & $(OBJS)\mmediadll_sndwav.obj & $(OBJS)\mmediadll_vidbase.obj -MMEDIALIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=..\..\src\mmedia\..\..\..\include -i=$(SETUPHDIR) & - -i=..\..\src\mmedia\..\..\include $(CXXFLAGS) & - /fh=$(OBJS)\wxprec_mmedialib.pch $(__EXCEPTIONSFLAG) +MMEDIALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=..\..\src\mmedia\..\..\..\include -i=$(SETUPHDIR) & + -i=..\..\src\mmedia\..\..\include /fh=$(OBJS)\wxprec_mmedialib.pch & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) MMEDIALIB_OBJECTS = & $(OBJS)\mmedialib_dummy.obj & $(OBJS)\mmedialib_cdwin.obj & @@ -402,5 +403,5 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib : $(MMEDIALIB_OBJECTS) @%create $(OBJS)\mmedialib.lbc @for %i in ($(MMEDIALIB_OBJECTS)) do @%append $(OBJS)\mmedialib.lbc +%i - wlib -q -p2048 -n -b $^@ @$(OBJS)\mmedialib.lbc + wlib -q -p4096 -n -b $^@ @$(OBJS)\mmedialib.lbc !endif diff --git a/contrib/build/net/makefile.bcc b/contrib/build/net/makefile.bcc index 6ae868f..408a756 100644 --- a/contrib/build/net/makefile.bcc +++ b/contrib/build/net/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,27 +19,23 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -NETUTILSDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\net\..\..\..\include \ - -I$(SETUPHDIR) -I..\..\src\net\..\..\include -DWXUSINGDLL \ - -DWXMAKINGDLL_NETUTILS $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_netutilsdll.csm +NETUTILSDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\net\..\..\..\include -I$(SETUPHDIR) \ + -I..\..\src\net\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_NETUTILS -Hu \ + -H=$(OBJS)\wxprec_netutilsdll.csm $(CPPFLAGS) $(CXXFLAGS) NETUTILSDLL_OBJECTS = \ $(OBJS)\netutilsdll_dummy.obj \ $(OBJS)\netutilsdll_email.obj \ $(OBJS)\netutilsdll_smapi.obj \ $(OBJS)\netutilsdll_web.obj -NETUTILSLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\net\..\..\..\include \ - -I$(SETUPHDIR) -I..\..\src\net\..\..\include $(CXXFLAGS) -Hu \ - -H=$(OBJS)\wxprec_netutilslib.csm +NETUTILSLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\net\..\..\..\include -I$(SETUPHDIR) \ + -I..\..\src\net\..\..\include -Hu -H=$(OBJS)\wxprec_netutilslib.csm \ + $(CPPFLAGS) $(CXXFLAGS) NETUTILSLIB_OBJECTS = \ $(OBJS)\netutilslib_dummy.obj \ $(OBJS)\netutilslib_email.obj \ @@ -201,7 +202,7 @@ clean: !if "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_bcc$(VENDORTAG).dll: $(OBJS)\netutilsdll_dummy.obj $(NETUTILSDLL_OBJECTS) - ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| c0d32.obj $(NETUTILSDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils $@ @@ -210,7 +211,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netuti !if "$(SHARED)" == "0" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib: $(OBJS)\netutilslib_dummy.obj $(NETUTILSLIB_OBJECTS) if exist $@ del $@ - tlib /a /p2048 $@ @&&| + tlib /a /p4096 $@ @&&| $(NETUTILSLIB_OBJECTS) | !endif diff --git a/contrib/build/net/makefile.gcc b/contrib/build/net/makefile.gcc index 669a06f..c21d5ff 100644 --- a/contrib/build/net/makefile.gcc +++ b/contrib/build/net/makefile.gcc @@ -12,21 +12,21 @@ include ../../../build/msw/config.gcc ### Variables: ### -NETUTILSDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ +NETUTILSDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\src\net\..\..\..\include -I$(SETUPHDIR) -Wall \ -I..\..\src\net\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_NETUTILS \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS) NETUTILSDLL_OBJECTS = \ $(OBJS)\netutilsdll_dummy.o \ $(OBJS)\netutilsdll_email.o \ $(OBJS)\netutilsdll_smapi.o \ $(OBJS)\netutilsdll_web.o -NETUTILSLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ +NETUTILSLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\src\net\..\..\..\include -I$(SETUPHDIR) -Wall \ - -I..\..\src\net\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_0) + -I..\..\src\net\..\..\include $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \ + $(CPPFLAGS) $(CXXFLAGS) NETUTILSLIB_OBJECTS = \ $(OBJS)\netutilslib_dummy.o \ $(OBJS)\netutilslib_email.o \ diff --git a/contrib/build/net/makefile.vc b/contrib/build/net/makefile.vc index 181471d..808d593 100644 --- a/contrib/build/net/makefile.vc +++ b/contrib/build/net/makefile.vc @@ -12,28 +12,29 @@ ### Variables: ### -NETUTILSDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_2) \ +NETUTILSDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_vc$(VENDORTAG).pdb \ $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\src\net\..\..\..\include /I$(SETUPHDIR) /W4 \ /I..\..\src\net\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_NETUTILS \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_netutilsdll.pch" + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_netutilsdll.pch" $(CPPFLAGS) $(CXXFLAGS) NETUTILSDLL_OBJECTS = \ $(OBJS)\netutilsdll_dummy.obj \ $(OBJS)\netutilsdll_email.obj \ $(OBJS)\netutilsdll_smapi.obj \ $(OBJS)\netutilsdll_web.obj -NETUTILSLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) \ - /DWIN32 $(__DEBUGINFO_2) \ +NETUTILSLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \ + $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.pdb \ $(____DEBUGRUNTIME_14_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\src\net\..\..\..\include /I$(SETUPHDIR) /W4 \ - /I..\..\src\net\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netutilslib.pch" + /I..\..\src\net\..\..\include $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netutilslib.pch" $(CPPFLAGS) \ + $(CXXFLAGS) NETUTILSLIB_OBJECTS = \ $(OBJS)\netutilslib_dummy.obj \ $(OBJS)\netutilslib_email.obj \ diff --git a/contrib/build/net/makefile.wat b/contrib/build/net/makefile.wat index bf226a6..1dd9804 100644 --- a/contrib/build/net/makefile.wat +++ b/contrib/build/net/makefile.wat @@ -180,21 +180,22 @@ __netutilslib___depname = & ### Variables: ### -NETUTILSDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & +NETUTILSDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=..\..\src\net\..\..\..\include -i=$(SETUPHDIR) & -i=..\..\src\net\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_NETUTILS & - $(CXXFLAGS) /fh=$(OBJS)\wxprec_netutilsdll.pch $(__EXCEPTIONSFLAG) + /fh=$(OBJS)\wxprec_netutilsdll.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) & + $(CXXFLAGS) NETUTILSDLL_OBJECTS = & $(OBJS)\netutilsdll_dummy.obj & $(OBJS)\netutilsdll_email.obj & $(OBJS)\netutilsdll_smapi.obj & $(OBJS)\netutilsdll_web.obj -NETUTILSLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=..\..\src\net\..\..\..\include -i=$(SETUPHDIR) & - -i=..\..\src\net\..\..\include $(CXXFLAGS) & - /fh=$(OBJS)\wxprec_netutilslib.pch $(__EXCEPTIONSFLAG) +NETUTILSLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=..\..\src\net\..\..\..\include -i=$(SETUPHDIR) & + -i=..\..\src\net\..\..\include /fh=$(OBJS)\wxprec_netutilslib.pch & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) NETUTILSLIB_OBJECTS = & $(OBJS)\netutilslib_dummy.obj & $(OBJS)\netutilslib_email.obj & @@ -266,5 +267,5 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netuti $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib : $(NETUTILSLIB_OBJECTS) @%create $(OBJS)\netutilslib.lbc @for %i in ($(NETUTILSLIB_OBJECTS)) do @%append $(OBJS)\netutilslib.lbc +%i - wlib -q -p2048 -n -b $^@ @$(OBJS)\netutilslib.lbc + wlib -q -p4096 -n -b $^@ @$(OBJS)\netutilslib.lbc !endif diff --git a/contrib/build/ogl/makefile.bcc b/contrib/build/ogl/makefile.bcc index d43c492..5667d2d 100644 --- a/contrib/build/ogl/makefile.bcc +++ b/contrib/build/ogl/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,19 +19,15 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OGLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include \ - -I$(SETUPHDIR) -I..\..\src\ogl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_OGL \ - $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_ogldll.csm +OGLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I$(SETUPHDIR) \ + -I..\..\src\ogl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_OGL -Hu \ + -H=$(OBJS)\wxprec_ogldll.csm $(CPPFLAGS) $(CXXFLAGS) OGLDLL_OBJECTS = \ $(OBJS)\ogldll_dummy.obj \ $(OBJS)\ogldll_basic2.obj \ @@ -41,11 +42,11 @@ OGLDLL_OBJECTS = \ $(OBJS)\ogldll_constrnt.obj \ $(OBJS)\ogldll_lines.obj \ $(OBJS)\ogldll_ogldiag.obj -OGLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include \ - -I$(SETUPHDIR) -I..\..\src\ogl\..\..\include $(CXXFLAGS) -Hu \ - -H=$(OBJS)\wxprec_ogllib.csm +OGLLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I$(SETUPHDIR) \ + -I..\..\src\ogl\..\..\include -Hu -H=$(OBJS)\wxprec_ogllib.csm $(CPPFLAGS) \ + $(CXXFLAGS) OGLLIB_OBJECTS = \ $(OBJS)\ogllib_dummy.obj \ $(OBJS)\ogllib_basic2.obj \ @@ -273,7 +274,7 @@ clean: !if "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll: $(OBJS)\ogldll_dummy.obj $(OGLDLL_OBJECTS) - ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| c0d32.obj $(OGLDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl $@ @@ -282,7 +283,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bc !if "$(SHARED)" == "0" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib: $(OBJS)\ogllib_dummy.obj $(OGLLIB_OBJECTS) if exist $@ del $@ - tlib /a /p2048 $@ @&&| + tlib /a /p4096 $@ @&&| $(OGLLIB_OBJECTS) | !endif diff --git a/contrib/build/ogl/makefile.gcc b/contrib/build/ogl/makefile.gcc index 4538004..e945585 100644 --- a/contrib/build/ogl/makefile.gcc +++ b/contrib/build/ogl/makefile.gcc @@ -14,11 +14,11 @@ include ../../../build/msw/config.gcc OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OGLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I$(SETUPHDIR) -Wall \ - -I..\..\src\ogl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_OGL $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) +OGLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I..\..\src\ogl\..\..\..\include -I$(SETUPHDIR) -Wall \ + -I..\..\src\ogl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_OGL \ + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS) OGLDLL_OBJECTS = \ $(OBJS)\ogldll_dummy.o \ $(OBJS)\ogldll_basic2.o \ @@ -33,11 +33,11 @@ OGLDLL_OBJECTS = \ $(OBJS)\ogldll_constrnt.o \ $(OBJS)\ogldll_lines.o \ $(OBJS)\ogldll_ogldiag.o -OGLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I$(SETUPHDIR) -Wall \ - -I..\..\src\ogl\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_0) +OGLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I..\..\src\ogl\..\..\..\include -I$(SETUPHDIR) -Wall \ + -I..\..\src\ogl\..\..\include $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \ + $(CPPFLAGS) $(CXXFLAGS) OGLLIB_OBJECTS = \ $(OBJS)\ogllib_dummy.o \ $(OBJS)\ogllib_basic2.o \ diff --git a/contrib/build/ogl/makefile.vc b/contrib/build/ogl/makefile.vc index 6c6b61c..e455523 100644 --- a/contrib/build/ogl/makefile.vc +++ b/contrib/build/ogl/makefile.vc @@ -14,15 +14,15 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OGLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ +OGLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).pdb \ $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\src\ogl\..\..\..\include /I$(SETUPHDIR) /W4 \ - /I..\..\src\ogl\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_OGL $(CXXFLAGS) \ + /I..\..\src\ogl\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_OGL \ $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_ogldll.pch" + /Fp"$(OBJS)\wxprec_ogldll.pch" $(CPPFLAGS) $(CXXFLAGS) OGLDLL_OBJECTS = \ $(OBJS)\ogldll_dummy.obj \ $(OBJS)\ogldll_basic2.obj \ @@ -37,14 +37,14 @@ OGLDLL_OBJECTS = \ $(OBJS)\ogldll_constrnt.obj \ $(OBJS)\ogldll_lines.obj \ $(OBJS)\ogldll_ogldiag.obj -OGLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \ +OGLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \ $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.pdb \ $(____DEBUGRUNTIME_14_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\src\ogl\..\..\..\include /I$(SETUPHDIR) /W4 \ - /I..\..\src\ogl\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_ogllib.pch" + /I..\..\src\ogl\..\..\include $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_ogllib.pch" $(CPPFLAGS) $(CXXFLAGS) OGLLIB_OBJECTS = \ $(OBJS)\ogllib_dummy.obj \ $(OBJS)\ogllib_basic2.obj \ diff --git a/contrib/build/ogl/makefile.wat b/contrib/build/ogl/makefile.wat index 752d77c..67cfed0 100644 --- a/contrib/build/ogl/makefile.wat +++ b/contrib/build/ogl/makefile.wat @@ -182,11 +182,11 @@ __ogllib___depname = & OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OGLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=..\..\src\ogl\..\..\..\include -i=$(SETUPHDIR) & - -i=..\..\src\ogl\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_OGL $(CXXFLAGS) & - /fh=$(OBJS)\wxprec_ogldll.pch $(__EXCEPTIONSFLAG) +OGLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=..\..\src\ogl\..\..\..\include -i=$(SETUPHDIR) & + -i=..\..\src\ogl\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_OGL & + /fh=$(OBJS)\wxprec_ogldll.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) OGLDLL_OBJECTS = & $(OBJS)\ogldll_dummy.obj & $(OBJS)\ogldll_basic2.obj & @@ -201,11 +201,11 @@ OGLDLL_OBJECTS = & $(OBJS)\ogldll_constrnt.obj & $(OBJS)\ogldll_lines.obj & $(OBJS)\ogldll_ogldiag.obj -OGLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=..\..\src\ogl\..\..\..\include -i=$(SETUPHDIR) & - -i=..\..\src\ogl\..\..\include $(CXXFLAGS) /fh=$(OBJS)\wxprec_ogllib.pch & - $(__EXCEPTIONSFLAG) +OGLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=..\..\src\ogl\..\..\..\include -i=$(SETUPHDIR) & + -i=..\..\src\ogl\..\..\include /fh=$(OBJS)\wxprec_ogllib.pch & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) OGLLIB_OBJECTS = & $(OBJS)\ogllib_dummy.obj & $(OBJS)\ogllib_basic2.obj & @@ -338,5 +338,5 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_wa $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib : $(OGLLIB_OBJECTS) @%create $(OBJS)\ogllib.lbc @for %i in ($(OGLLIB_OBJECTS)) do @%append $(OBJS)\ogllib.lbc +%i - wlib -q -p2048 -n -b $^@ @$(OBJS)\ogllib.lbc + wlib -q -p4096 -n -b $^@ @$(OBJS)\ogllib.lbc !endif diff --git a/contrib/build/plot/makefile.bcc b/contrib/build/plot/makefile.bcc index 1ce8f5a..31b8568 100644 --- a/contrib/build/plot/makefile.bcc +++ b/contrib/build/plot/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,29 +19,23 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PLOTDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\src\plot\..\..\..\include -I$(SETUPHDIR) \ - -I..\..\src\plot\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_PLOT $(CXXFLAGS) \ - -Hu -H=$(OBJS)\wxprec_plotdll.csm +PLOTDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\plot\..\..\..\include -I$(SETUPHDIR) \ + -I..\..\src\plot\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_PLOT -Hu \ + -H=$(OBJS)\wxprec_plotdll.csm $(CPPFLAGS) $(CXXFLAGS) PLOTDLL_OBJECTS = \ $(OBJS)\plotdll_dummy.obj \ $(OBJS)\plotdll_plot.obj -PLOTLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - -I..\..\src\plot\..\..\..\include -I$(SETUPHDIR) \ - -I..\..\src\plot\..\..\include $(CXXFLAGS) -Hu \ - -H=$(OBJS)\wxprec_plotlib.csm +PLOTLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\plot\..\..\..\include -I$(SETUPHDIR) \ + -I..\..\src\plot\..\..\include -Hu -H=$(OBJS)\wxprec_plotlib.csm \ + $(CPPFLAGS) $(CXXFLAGS) PLOTLIB_OBJECTS = \ $(OBJS)\plotlib_dummy.obj \ $(OBJS)\plotlib_plot.obj @@ -187,7 +186,7 @@ clean: !if "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_bcc$(VENDORTAG).dll: $(OBJS)\plotdll_dummy.obj $(PLOTDLL_OBJECTS) - ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| c0d32.obj $(PLOTDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot $@ @@ -196,7 +195,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_b !if "$(SHARED)" == "0" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib: $(OBJS)\plotlib_dummy.obj $(PLOTLIB_OBJECTS) if exist $@ del $@ - tlib /a /p2048 $@ @&&| + tlib /a /p4096 $@ @&&| $(PLOTLIB_OBJECTS) | !endif diff --git a/contrib/build/plot/makefile.gcc b/contrib/build/plot/makefile.gcc index 54a8d17..21b3819 100644 --- a/contrib/build/plot/makefile.gcc +++ b/contrib/build/plot/makefile.gcc @@ -14,19 +14,19 @@ include ../../../build/msw/config.gcc OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PLOTDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\plot\..\..\..\include -I$(SETUPHDIR) \ - -Wall -I..\..\src\plot\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_PLOT \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) +PLOTDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I..\..\src\plot\..\..\..\include -I$(SETUPHDIR) -Wall \ + -I..\..\src\plot\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_PLOT \ + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS) PLOTDLL_OBJECTS = \ $(OBJS)\plotdll_dummy.o \ $(OBJS)\plotdll_plot.o -PLOTLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\plot\..\..\..\include -I$(SETUPHDIR) \ - -Wall -I..\..\src\plot\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_0) +PLOTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I..\..\src\plot\..\..\..\include -I$(SETUPHDIR) -Wall \ + -I..\..\src\plot\..\..\include $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \ + $(CPPFLAGS) $(CXXFLAGS) PLOTLIB_OBJECTS = \ $(OBJS)\plotlib_dummy.o \ $(OBJS)\plotlib_plot.o diff --git a/contrib/build/plot/makefile.vc b/contrib/build/plot/makefile.vc index e492a15..803fb44 100644 --- a/contrib/build/plot/makefile.vc +++ b/contrib/build/plot/makefile.vc @@ -14,26 +14,26 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PLOTDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ +PLOTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_vc$(VENDORTAG).pdb \ $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\src\plot\..\..\..\include /I$(SETUPHDIR) /W4 \ - /I..\..\src\plot\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_PLOT $(CXXFLAGS) \ + /I..\..\src\plot\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_PLOT \ $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_plotdll.pch" + /Fp"$(OBJS)\wxprec_plotdll.pch" $(CPPFLAGS) $(CXXFLAGS) PLOTDLL_OBJECTS = \ $(OBJS)\plotdll_dummy.obj \ $(OBJS)\plotdll_plot.obj -PLOTLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \ +PLOTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \ $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.pdb \ $(____DEBUGRUNTIME_14_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\src\plot\..\..\..\include /I$(SETUPHDIR) /W4 \ - /I..\..\src\plot\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_plotlib.pch" + /I..\..\src\plot\..\..\include $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_plotlib.pch" $(CPPFLAGS) $(CXXFLAGS) PLOTLIB_OBJECTS = \ $(OBJS)\plotlib_dummy.obj \ $(OBJS)\plotlib_plot.obj diff --git a/contrib/build/plot/makefile.wat b/contrib/build/plot/makefile.wat index 6223e0a..d33033c 100644 --- a/contrib/build/plot/makefile.wat +++ b/contrib/build/plot/makefile.wat @@ -182,19 +182,19 @@ __plotlib___depname = & OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PLOTDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=..\..\src\plot\..\..\..\include -i=$(SETUPHDIR) & - -i=..\..\src\plot\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_PLOT $(CXXFLAGS) & - /fh=$(OBJS)\wxprec_plotdll.pch $(__EXCEPTIONSFLAG) +PLOTDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=..\..\src\plot\..\..\..\include -i=$(SETUPHDIR) & + -i=..\..\src\plot\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_PLOT & + /fh=$(OBJS)\wxprec_plotdll.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) PLOTDLL_OBJECTS = & $(OBJS)\plotdll_dummy.obj & $(OBJS)\plotdll_plot.obj -PLOTLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=..\..\src\plot\..\..\..\include -i=$(SETUPHDIR) & - -i=..\..\src\plot\..\..\include $(CXXFLAGS) /fh=$(OBJS)\wxprec_plotlib.pch & - $(__EXCEPTIONSFLAG) +PLOTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=..\..\src\plot\..\..\..\include -i=$(SETUPHDIR) & + -i=..\..\src\plot\..\..\include /fh=$(OBJS)\wxprec_plotlib.pch & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) PLOTLIB_OBJECTS = & $(OBJS)\plotlib_dummy.obj & $(OBJS)\plotlib_plot.obj @@ -250,5 +250,5 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_w $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib : $(PLOTLIB_OBJECTS) @%create $(OBJS)\plotlib.lbc @for %i in ($(PLOTLIB_OBJECTS)) do @%append $(OBJS)\plotlib.lbc +%i - wlib -q -p2048 -n -b $^@ @$(OBJS)\plotlib.lbc + wlib -q -p4096 -n -b $^@ @$(OBJS)\plotlib.lbc !endif diff --git a/contrib/build/stc/makefile.bcc b/contrib/build/stc/makefile.bcc index 1cc3646..8911f09 100644 --- a/contrib/build/stc/makefile.bcc +++ b/contrib/build/stc/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,22 +19,18 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STCDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include \ - -I$(SETUPHDIR) -I..\..\src\stc\..\..\include \ - -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\src -D__WX__ \ - -DSCI_LEXER -DLINK_LEXERS -DWXUSINGDLL -DWXMAKINGDLL_STC $(CXXFLAGS) +STCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include -I$(SETUPHDIR) \ + -I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include \ + -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + -DWXUSINGDLL -DWXMAKINGDLL_STC $(CPPFLAGS) $(CXXFLAGS) STCDLL_OBJECTS = \ $(OBJS)\stcdll_PlatWX.obj \ $(OBJS)\stcdll_ScintillaWX.obj \ @@ -84,12 +85,12 @@ STCDLL_OBJECTS = \ $(OBJS)\stcdll_ViewStyle.obj \ $(OBJS)\stcdll_WindowAccessor.obj \ $(OBJS)\stcdll_XPM.obj -STCLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include \ - -I$(SETUPHDIR) -I..\..\src\stc\..\..\include \ - -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\src -D__WX__ \ - -DSCI_LEXER -DLINK_LEXERS $(CXXFLAGS) +STCLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include -I$(SETUPHDIR) \ + -I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include \ + -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CPPFLAGS) \ + $(CXXFLAGS) STCLIB_OBJECTS = \ $(OBJS)\stclib_PlatWX.obj \ $(OBJS)\stclib_ScintillaWX.obj \ @@ -595,7 +596,7 @@ clean: !if "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll: $(STCDLL_OBJECTS) - ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| c0d32.obj $(STCDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc $@ @@ -604,7 +605,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bc !if "$(SHARED)" == "0" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib: $(STCLIB_OBJECTS) if exist $@ del $@ - tlib /a /p2048 $@ @&&| + tlib /a /p4096 $@ @&&| $(STCLIB_OBJECTS) | !endif diff --git a/contrib/build/stc/makefile.gcc b/contrib/build/stc/makefile.gcc index 0995c99..928b28d 100644 --- a/contrib/build/stc/makefile.gcc +++ b/contrib/build/stc/makefile.gcc @@ -16,13 +16,13 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STCDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include -I$(SETUPHDIR) -Wall \ +STCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I..\..\src\stc\..\..\..\include -I$(SETUPHDIR) -Wall \ -I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include \ -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ - -DWXUSINGDLL -DWXMAKINGDLL_STC $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_0) + -DWXUSINGDLL -DWXMAKINGDLL_STC $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \ + $(CPPFLAGS) $(CXXFLAGS) STCDLL_OBJECTS = \ $(OBJS)\stcdll_PlatWX.o \ $(OBJS)\stcdll_ScintillaWX.o \ @@ -77,12 +77,12 @@ STCDLL_OBJECTS = \ $(OBJS)\stcdll_ViewStyle.o \ $(OBJS)\stcdll_WindowAccessor.o \ $(OBJS)\stcdll_XPM.o -STCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include -I$(SETUPHDIR) -Wall \ +STCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I..\..\src\stc\..\..\..\include -I$(SETUPHDIR) -Wall \ -I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include \ - -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) + -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS) STCLIB_OBJECTS = \ $(OBJS)\stclib_PlatWX.o \ $(OBJS)\stclib_ScintillaWX.o \ diff --git a/contrib/build/stc/makefile.vc b/contrib/build/stc/makefile.vc index 6d3ca34..2f5a55c 100644 --- a/contrib/build/stc/makefile.vc +++ b/contrib/build/stc/makefile.vc @@ -16,7 +16,7 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STCDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ +STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).pdb \ $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ @@ -24,8 +24,8 @@ STCDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ /I..\..\src\stc\..\..\..\include /I$(SETUPHDIR) /W4 \ /I..\..\src\stc\..\..\include /I..\..\src\stc\scintilla\include \ /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ - /DWXUSINGDLL /DWXMAKINGDLL_STC $(CXXFLAGS) $(__EXCEPTIONSFLAG_0) \ - $(__EXCEPTIONSFLAG) + /DWXUSINGDLL /DWXMAKINGDLL_STC $(__EXCEPTIONSFLAG_0) $(__EXCEPTIONSFLAG) \ + $(CPPFLAGS) $(CXXFLAGS) STCDLL_OBJECTS = \ $(OBJS)\stcdll_PlatWX.obj \ $(OBJS)\stcdll_ScintillaWX.obj \ @@ -80,15 +80,15 @@ STCDLL_OBJECTS = \ $(OBJS)\stcdll_ViewStyle.obj \ $(OBJS)\stcdll_WindowAccessor.obj \ $(OBJS)\stcdll_XPM.obj -STCLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_14) /DWIN32 \ +STCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_14) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.pdb \ $(____DEBUGRUNTIME_13_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\src\stc\..\..\..\include /I$(SETUPHDIR) /W4 \ /I..\..\src\stc\..\..\include /I..\..\src\stc\scintilla\include \ - /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_0) $(__EXCEPTIONSFLAG) + /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ + $(__EXCEPTIONSFLAG_0) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) STCLIB_OBJECTS = \ $(OBJS)\stclib_PlatWX.obj \ $(OBJS)\stclib_ScintillaWX.obj \ diff --git a/contrib/build/stc/makefile.wat b/contrib/build/stc/makefile.wat index dcb0e10..4410639 100644 --- a/contrib/build/stc/makefile.wat +++ b/contrib/build/stc/makefile.wat @@ -184,12 +184,12 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STCDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=..\..\src\stc\..\..\..\include -i=$(SETUPHDIR) & +STCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=..\..\src\stc\..\..\..\include -i=$(SETUPHDIR) & -i=..\..\src\stc\..\..\include -i=..\..\src\stc\scintilla\include & -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS & - -dWXUSINGDLL -dWXMAKINGDLL_STC $(CXXFLAGS) $(__EXCEPTIONSFLAG) + -dWXUSINGDLL -dWXMAKINGDLL_STC $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) STCDLL_OBJECTS = & $(OBJS)\stcdll_PlatWX.obj & $(OBJS)\stcdll_ScintillaWX.obj & @@ -244,12 +244,12 @@ STCDLL_OBJECTS = & $(OBJS)\stcdll_ViewStyle.obj & $(OBJS)\stcdll_WindowAccessor.obj & $(OBJS)\stcdll_XPM.obj -STCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=..\..\src\stc\..\..\..\include -i=$(SETUPHDIR) & +STCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=..\..\src\stc\..\..\..\include -i=$(SETUPHDIR) & -i=..\..\src\stc\..\..\include -i=..\..\src\stc\scintilla\include & -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS & - $(CXXFLAGS) $(__EXCEPTIONSFLAG) + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) STCLIB_OBJECTS = & $(OBJS)\stclib_PlatWX.obj & $(OBJS)\stclib_ScintillaWX.obj & @@ -660,5 +660,5 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_wa $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib : $(STCLIB_OBJECTS) @%create $(OBJS)\stclib.lbc @for %i in ($(STCLIB_OBJECTS)) do @%append $(OBJS)\stclib.lbc +%i - wlib -q -p2048 -n -b $^@ @$(OBJS)\stclib.lbc + wlib -q -p4096 -n -b $^@ @$(OBJS)\stclib.lbc !endif diff --git a/contrib/build/svg/makefile.bcc b/contrib/build/svg/makefile.bcc index 1cd59d6..e417a8f 100644 --- a/contrib/build/svg/makefile.bcc +++ b/contrib/build/svg/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,29 +19,25 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SVGDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\svg\..\..\..\include \ - -I$(SETUPHDIR) -I..\..\src\svg\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_SVG \ - $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_svgdll.csm +SVGDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\svg\..\..\..\include -I$(SETUPHDIR) \ + -I..\..\src\svg\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_SVG -Hu \ + -H=$(OBJS)\wxprec_svgdll.csm $(CPPFLAGS) $(CXXFLAGS) SVGDLL_OBJECTS = \ $(OBJS)\svgdll_dummy.obj \ $(OBJS)\svgdll_dcsvg.obj -SVGLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\svg\..\..\..\include \ - -I$(SETUPHDIR) -I..\..\src\svg\..\..\include $(CXXFLAGS) -Hu \ - -H=$(OBJS)\wxprec_svglib.csm +SVGLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\svg\..\..\..\include -I$(SETUPHDIR) \ + -I..\..\src\svg\..\..\include -Hu -H=$(OBJS)\wxprec_svglib.csm $(CPPFLAGS) \ + $(CXXFLAGS) SVGLIB_OBJECTS = \ $(OBJS)\svglib_dummy.obj \ $(OBJS)\svglib_dcsvg.obj @@ -185,7 +186,7 @@ clean: !if "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_bcc$(VENDORTAG).dll: $(OBJS)\svgdll_dummy.obj $(SVGDLL_OBJECTS) - ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| c0d32.obj $(SVGDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg $@ @@ -194,7 +195,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_bc !if "$(SHARED)" == "0" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib: $(OBJS)\svglib_dummy.obj $(SVGLIB_OBJECTS) if exist $@ del $@ - tlib /a /p2048 $@ @&&| + tlib /a /p4096 $@ @&&| $(SVGLIB_OBJECTS) | !endif diff --git a/contrib/build/svg/makefile.gcc b/contrib/build/svg/makefile.gcc index 45d2798..dc9408b 100644 --- a/contrib/build/svg/makefile.gcc +++ b/contrib/build/svg/makefile.gcc @@ -16,19 +16,19 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SVGDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\svg\..\..\..\include -I$(SETUPHDIR) -Wall \ - -I..\..\src\svg\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_SVG $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) +SVGDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I..\..\src\svg\..\..\..\include -I$(SETUPHDIR) -Wall \ + -I..\..\src\svg\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_SVG \ + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS) SVGDLL_OBJECTS = \ $(OBJS)\svgdll_dummy.o \ $(OBJS)\svgdll_dcsvg.o -SVGLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\svg\..\..\..\include -I$(SETUPHDIR) -Wall \ - -I..\..\src\svg\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_0) +SVGLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I..\..\src\svg\..\..\..\include -I$(SETUPHDIR) -Wall \ + -I..\..\src\svg\..\..\include $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \ + $(CPPFLAGS) $(CXXFLAGS) SVGLIB_OBJECTS = \ $(OBJS)\svglib_dummy.o \ $(OBJS)\svglib_dcsvg.o diff --git a/contrib/build/svg/makefile.vc b/contrib/build/svg/makefile.vc index f415b30..4b1b82f 100644 --- a/contrib/build/svg/makefile.vc +++ b/contrib/build/svg/makefile.vc @@ -16,26 +16,26 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SVGDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ +SVGDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_vc$(VENDORTAG).pdb \ $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\src\svg\..\..\..\include /I$(SETUPHDIR) /W4 \ - /I..\..\src\svg\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_SVG $(CXXFLAGS) \ + /I..\..\src\svg\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_SVG \ $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_svgdll.pch" + /Fp"$(OBJS)\wxprec_svgdll.pch" $(CPPFLAGS) $(CXXFLAGS) SVGDLL_OBJECTS = \ $(OBJS)\svgdll_dummy.obj \ $(OBJS)\svgdll_dcsvg.obj -SVGLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \ +SVGLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \ $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.pdb \ $(____DEBUGRUNTIME_14_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\src\svg\..\..\..\include /I$(SETUPHDIR) /W4 \ - /I..\..\src\svg\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_svglib.pch" + /I..\..\src\svg\..\..\include $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_svglib.pch" $(CPPFLAGS) $(CXXFLAGS) SVGLIB_OBJECTS = \ $(OBJS)\svglib_dummy.obj \ $(OBJS)\svglib_dcsvg.obj diff --git a/contrib/build/svg/makefile.wat b/contrib/build/svg/makefile.wat index c3b46ed..4f68da5 100644 --- a/contrib/build/svg/makefile.wat +++ b/contrib/build/svg/makefile.wat @@ -184,19 +184,19 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SVGDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=..\..\src\svg\..\..\..\include -i=$(SETUPHDIR) & - -i=..\..\src\svg\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_SVG $(CXXFLAGS) & - /fh=$(OBJS)\wxprec_svgdll.pch $(__EXCEPTIONSFLAG) +SVGDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=..\..\src\svg\..\..\..\include -i=$(SETUPHDIR) & + -i=..\..\src\svg\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_SVG & + /fh=$(OBJS)\wxprec_svgdll.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) SVGDLL_OBJECTS = & $(OBJS)\svgdll_dummy.obj & $(OBJS)\svgdll_dcsvg.obj -SVGLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=..\..\src\svg\..\..\..\include -i=$(SETUPHDIR) & - -i=..\..\src\svg\..\..\include $(CXXFLAGS) /fh=$(OBJS)\wxprec_svglib.pch & - $(__EXCEPTIONSFLAG) +SVGLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=..\..\src\svg\..\..\..\include -i=$(SETUPHDIR) & + -i=..\..\src\svg\..\..\include /fh=$(OBJS)\wxprec_svglib.pch & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) SVGLIB_OBJECTS = & $(OBJS)\svglib_dummy.obj & $(OBJS)\svglib_dcsvg.obj @@ -250,5 +250,5 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_wa $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib : $(SVGLIB_OBJECTS) @%create $(OBJS)\svglib.lbc @for %i in ($(SVGLIB_OBJECTS)) do @%append $(OBJS)\svglib.lbc +%i - wlib -q -p2048 -n -b $^@ @$(OBJS)\svglib.lbc + wlib -q -p4096 -n -b $^@ @$(OBJS)\svglib.lbc !endif diff --git a/contrib/build/xrc/makefile.bcc b/contrib/build/xrc/makefile.bcc index 1cd458c..df96dad 100644 --- a/contrib/build/xrc/makefile.bcc +++ b/contrib/build/xrc/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,21 +19,17 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -XRCDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include \ - -I$(SETUPHDIR) -I..\..\src\xrc\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_XRC \ - $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_xrcdll.csm +XRCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I$(SETUPHDIR) \ + -I..\..\src\xrc\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_XRC -Hu \ + -H=$(OBJS)\wxprec_xrcdll.csm $(CPPFLAGS) $(CXXFLAGS) XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_dummy.obj \ $(OBJS)\xrcdll_xmlres.obj \ @@ -68,12 +69,12 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_unkwn.obj \ $(OBJS)\xrcdll_xh_wizrd.obj \ $(OBJS)\xrcdll_xmlrsall.obj -XRCLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include \ - -I$(SETUPHDIR) -I..\..\src\xrc\..\..\include \ - -I..\..\src\xrc\expat\xmlparse -I..\..\src\xrc\expat\xmltok $(CXXFLAGS) -Hu \ - -H=$(OBJS)\wxprec_xrclib.csm +XRCLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I$(SETUPHDIR) \ + -I..\..\src\xrc\..\..\include -I..\..\src\xrc\expat\xmlparse \ + -I..\..\src\xrc\expat\xmltok -Hu -H=$(OBJS)\wxprec_xrclib.csm $(CPPFLAGS) \ + $(CXXFLAGS) XRCLIB_OBJECTS = \ $(OBJS)\xrclib_dummy.obj \ $(OBJS)\xrclib_xmlres.obj \ @@ -485,7 +486,7 @@ clean: !if "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_bcc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj $(XRCDLL_OBJECTS) - ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| c0d32.obj $(XRCDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc $@ @@ -494,7 +495,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_bc !if "$(SHARED)" == "0" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib: $(OBJS)\xrclib_dummy.obj $(XRCLIB_OBJECTS) if exist $@ del $@ - tlib /a /p2048 $@ @&&| + tlib /a /p4096 $@ @&&| $(XRCLIB_OBJECTS) | !endif diff --git a/contrib/build/xrc/makefile.gcc b/contrib/build/xrc/makefile.gcc index 8574435..5d080fe 100644 --- a/contrib/build/xrc/makefile.gcc +++ b/contrib/build/xrc/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -XRCDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I$(SETUPHDIR) -Wall \ - -I..\..\src\xrc\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_XRC $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) +XRCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I..\..\src\xrc\..\..\..\include -I$(SETUPHDIR) -Wall \ + -I..\..\src\xrc\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_XRC \ + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS) XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_dummy.o \ $(OBJS)\xrcdll_xmlres.o \ @@ -60,12 +60,12 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_unkwn.o \ $(OBJS)\xrcdll_xh_wizrd.o \ $(OBJS)\xrcdll_xmlrsall.o -XRCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I..\..\src\xrc\..\..\..\include -I$(SETUPHDIR) -Wall \ +XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I..\..\src\xrc\..\..\..\include -I$(SETUPHDIR) -Wall \ -I..\..\src\xrc\..\..\include -I..\..\src\xrc\expat\xmlparse \ - -I..\..\src\xrc\expat\xmltok $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_0) + -I..\..\src\xrc\expat\xmltok $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \ + $(CPPFLAGS) $(CXXFLAGS) XRCLIB_OBJECTS = \ $(OBJS)\xrclib_dummy.o \ $(OBJS)\xrclib_xmlres.o \ diff --git a/contrib/build/xrc/makefile.vc b/contrib/build/xrc/makefile.vc index 11230e3..87fdb74 100644 --- a/contrib/build/xrc/makefile.vc +++ b/contrib/build/xrc/makefile.vc @@ -16,15 +16,15 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -XRCDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ +XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).pdb \ $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\src\xrc\..\..\..\include /I$(SETUPHDIR) /W4 \ - /I..\..\src\xrc\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_XRC $(CXXFLAGS) \ + /I..\..\src\xrc\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_XRC \ $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_xrcdll.pch" + /Fp"$(OBJS)\wxprec_xrcdll.pch" $(CPPFLAGS) $(CXXFLAGS) XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_dummy.obj \ $(OBJS)\xrcdll_xmlres.obj \ @@ -64,15 +64,15 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_unkwn.obj \ $(OBJS)\xrcdll_xh_wizrd.obj \ $(OBJS)\xrcdll_xmlrsall.obj -XRCLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \ +XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \ $(__DEBUGINFO_2) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.pdb \ $(____DEBUGRUNTIME_14_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ /I..\..\src\xrc\..\..\..\include /I$(SETUPHDIR) /W4 \ /I..\..\src\xrc\..\..\include /I..\..\src\xrc\expat\xmlparse \ - /I..\..\src\xrc\expat\xmltok $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xrclib.pch" + /I..\..\src\xrc\expat\xmltok $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xrclib.pch" $(CPPFLAGS) $(CXXFLAGS) XRCLIB_OBJECTS = \ $(OBJS)\xrclib_dummy.obj \ $(OBJS)\xrclib_xmlres.obj \ diff --git a/contrib/build/xrc/makefile.wat b/contrib/build/xrc/makefile.wat index 90c1c92..049627f 100644 --- a/contrib/build/xrc/makefile.wat +++ b/contrib/build/xrc/makefile.wat @@ -198,11 +198,11 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -XRCDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=..\..\src\xrc\..\..\..\include -i=$(SETUPHDIR) & - -i=..\..\src\xrc\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_XRC $(CXXFLAGS) & - /fh=$(OBJS)\wxprec_xrcdll.pch $(__EXCEPTIONSFLAG) +XRCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=..\..\src\xrc\..\..\..\include -i=$(SETUPHDIR) & + -i=..\..\src\xrc\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_XRC & + /fh=$(OBJS)\wxprec_xrcdll.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) XRCDLL_OBJECTS = & $(OBJS)\xrcdll_dummy.obj & $(OBJS)\xrcdll_xmlres.obj & @@ -242,12 +242,12 @@ XRCDLL_OBJECTS = & $(OBJS)\xrcdll_xh_unkwn.obj & $(OBJS)\xrcdll_xh_wizrd.obj & $(OBJS)\xrcdll_xmlrsall.obj -XRCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=..\..\src\xrc\..\..\..\include -i=$(SETUPHDIR) & +XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=..\..\src\xrc\..\..\..\include -i=$(SETUPHDIR) & -i=..\..\src\xrc\..\..\include -i=..\..\src\xrc\expat\xmlparse & - -i=..\..\src\xrc\expat\xmltok $(CXXFLAGS) /fh=$(OBJS)\wxprec_xrclib.pch & - $(__EXCEPTIONSFLAG) + -i=..\..\src\xrc\expat\xmltok /fh=$(OBJS)\wxprec_xrclib.pch & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) XRCLIB_OBJECTS = & $(OBJS)\xrclib_dummy.obj & $(OBJS)\xrclib_xmlres.obj & @@ -553,5 +553,5 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wa $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib : $(XRCLIB_OBJECTS) @%create $(OBJS)\xrclib.lbc @for %i in ($(XRCLIB_OBJECTS)) do @%append $(OBJS)\xrclib.lbc +%i - wlib -q -p2048 -n -b $^@ @$(OBJS)\xrclib.lbc + wlib -q -p4096 -n -b $^@ @$(OBJS)\xrclib.lbc !endif diff --git a/contrib/samples/animate/Makefile.in b/contrib/samples/animate/Makefile.in index 327b824..bce8d8c 100644 --- a/contrib/samples/animate/Makefile.in +++ b/contrib/samples/animate/Makefile.in @@ -34,10 +34,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### -ANITEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \ - $(CXXFLAGS) +ANITEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ + $(CPPFLAGS) $(CXXFLAGS) ANITEST_OBJECTS = \ $(__anitest_os2_lib_res) \ anitest_anitest.o \ @@ -78,10 +77,9 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \ - anitest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \ - sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -i $(srcdir)/../../include -o anitest$(EXEEXT) \ + Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -141,7 +139,7 @@ anitest_anitest.o: $(srcdir)/anitest.cpp $(CXXC) -c -o $@ $(ANITEST_CXXFLAGS) $< anitest_anitest_rc.o: $(srcdir)/anitest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include @COND_PLATFORM_MACOSX_1@anitest_bundle: anitest.app/Contents/PkgInfo diff --git a/contrib/samples/animate/makefile.bcc b/contrib/samples/animate/makefile.bcc index 6e839db..4bac5ef 100644 --- a/contrib/samples/animate/makefile.bcc +++ b/contrib/samples/animate/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,17 +19,13 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -ANITEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +ANITEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \ - $(CXXFLAGS) + $(CPPFLAGS) $(CXXFLAGS) ANITEST_OBJECTS = \ $(OBJS)\anitest_anitest.obj OBJS = \ @@ -161,7 +162,7 @@ $(OBJS)\anitest_anitest.res: .\anitest.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -i.\..\..\include $** $(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_anitest.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(ANITEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\anitest_anitest.res | diff --git a/contrib/samples/animate/makefile.gcc b/contrib/samples/animate/makefile.gcc index 4c04833..31c1b97 100644 --- a/contrib/samples/animate/makefile.gcc +++ b/contrib/samples/animate/makefile.gcc @@ -12,11 +12,11 @@ include ../../../build/msw/config.gcc ### Variables: ### -ANITEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +ANITEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) ANITEST_OBJECTS = \ $(OBJS)\anitest_anitest.o \ $(OBJS)\anitest_anitest_rc.o diff --git a/contrib/samples/animate/makefile.vc b/contrib/samples/animate/makefile.vc index 4bbac23..e2bd905 100644 --- a/contrib/samples/animate/makefile.vc +++ b/contrib/samples/animate/makefile.vc @@ -12,12 +12,13 @@ ### Variables: ### -ANITEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\anitest.pdb $(____DEBUGRUNTIME_2_p) \ +ANITEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\anitest.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - /I.\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /I.\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) \ + $(CXXFLAGS) ANITEST_OBJECTS = \ $(OBJS)\anitest_anitest.obj \ $(OBJS)\anitest_anitest.res diff --git a/contrib/samples/animate/makefile.wat b/contrib/samples/animate/makefile.wat index 55d444c..c2968bb 100644 --- a/contrib/samples/animate/makefile.wat +++ b/contrib/samples/animate/makefile.wat @@ -167,11 +167,11 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -ANITEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include $(CXXFLAGS) & - $(__EXCEPTIONSFLAG_7) +ANITEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -i=.\..\..\include $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) & + $(CXXFLAGS) ANITEST_OBJECTS = & $(OBJS)\anitest_anitest.obj OBJS = & diff --git a/contrib/samples/deprecated/proplist/Makefile.in b/contrib/samples/deprecated/proplist/Makefile.in index 174959c..e4c7a97 100644 --- a/contrib/samples/deprecated/proplist/Makefile.in +++ b/contrib/samples/deprecated/proplist/Makefile.in @@ -36,10 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -PROPLIST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CPPFLAGS) \ - $(CXXFLAGS) +PROPLIST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ + -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS) PROPLIST_OBJECTS = \ $(__proplist_os2_lib_res) \ proplist_proplist.o \ @@ -78,10 +77,10 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \ - $(srcdir)/../../../include -o proplist$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../../samples -i $(srcdir)/../../../include -o \ + proplist$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \ + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -156,7 +155,7 @@ proplist_proplist.o: $(srcdir)/proplist.cpp $(CXXC) -c -o $@ $(PROPLIST_CXXFLAGS) $< proplist_proplist_rc.o: $(srcdir)/proplist.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(srcdir)/../../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(srcdir)/../../../include uninstall: diff --git a/contrib/samples/deprecated/proplist/makefile.bcc b/contrib/samples/deprecated/proplist/makefile.bcc index f1be87b..7164c61 100644 --- a/contrib/samples/deprecated/proplist/makefile.bcc +++ b/contrib/samples/deprecated/proplist/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,19 +19,15 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PROPLIST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +PROPLIST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \ -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\..\samples \ - -I.\..\..\..\include $(CXXFLAGS) + -I.\..\..\..\include $(CPPFLAGS) $(CXXFLAGS) PROPLIST_OBJECTS = \ $(OBJS)\proplist_proplist.obj SETUPHDIR = \ @@ -171,6 +172,6 @@ clean: -if exist $(OBJS)\proplist.ils del $(OBJS)\proplist.ils $(OBJS)\proplist.exe: $(PROPLIST_OBJECTS) $(OBJS)\proplist_proplist.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(PROPLIST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\proplist_proplist.res | diff --git a/contrib/samples/deprecated/proplist/makefile.gcc b/contrib/samples/deprecated/proplist/makefile.gcc index ea1698c..fa8e7b1 100644 --- a/contrib/samples/deprecated/proplist/makefile.gcc +++ b/contrib/samples/deprecated/proplist/makefile.gcc @@ -14,11 +14,11 @@ include ../../../../build/msw/config.gcc OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PROPLIST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +PROPLIST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) PROPLIST_OBJECTS = \ $(OBJS)\proplist_proplist.o \ $(OBJS)\proplist_proplist_rc.o diff --git a/contrib/samples/deprecated/proplist/makefile.vc b/contrib/samples/deprecated/proplist/makefile.vc index 906714e..389b4b9 100644 --- a/contrib/samples/deprecated/proplist/makefile.vc +++ b/contrib/samples/deprecated/proplist/makefile.vc @@ -14,13 +14,13 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PROPLIST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\proplist.pdb $(____DEBUGRUNTIME_2_p) \ +PROPLIST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\proplist.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples \ - /I.\..\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) \ - $(__EXCEPTIONSFLAG_9) + /I.\..\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) \ + $(CPPFLAGS) $(CXXFLAGS) PROPLIST_OBJECTS = \ $(OBJS)\proplist_proplist.obj \ $(OBJS)\proplist_proplist.res diff --git a/contrib/samples/deprecated/proplist/makefile.wat b/contrib/samples/deprecated/proplist/makefile.wat index 06c0ff3..bc5e931 100644 --- a/contrib/samples/deprecated/proplist/makefile.wat +++ b/contrib/samples/deprecated/proplist/makefile.wat @@ -169,11 +169,11 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PROPLIST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +PROPLIST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS) & - $(__EXCEPTIONSFLAG_7) + $(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) PROPLIST_OBJECTS = & $(OBJS)\proplist_proplist.obj SETUPHDIR = & diff --git a/contrib/samples/deprecated/resource/Makefile.in b/contrib/samples/deprecated/resource/Makefile.in index 0c99b9f..588a0b4 100644 --- a/contrib/samples/deprecated/resource/Makefile.in +++ b/contrib/samples/deprecated/resource/Makefile.in @@ -36,10 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -RESOURCE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CPPFLAGS) \ - $(CXXFLAGS) +RESOURCE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ + -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS) RESOURCE_OBJECTS = \ $(__resource_os2_lib_res) \ resource_resource.o \ @@ -78,10 +77,10 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \ - $(srcdir)/../../../include -o resource$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../../samples -i $(srcdir)/../../../include -o \ + resource$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \ + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -156,7 +155,7 @@ resource_resource.o: $(srcdir)/resource.cpp $(CXXC) -c -o $@ $(RESOURCE_CXXFLAGS) $< resource_resource_rc.o: $(srcdir)/resource.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(srcdir)/../../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(srcdir)/../../../include uninstall: diff --git a/contrib/samples/deprecated/resource/makefile.bcc b/contrib/samples/deprecated/resource/makefile.bcc index b5de3d9..eb2be09 100644 --- a/contrib/samples/deprecated/resource/makefile.bcc +++ b/contrib/samples/deprecated/resource/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,19 +19,15 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -RESOURCE_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +RESOURCE_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \ -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\..\samples \ - -I.\..\..\..\include $(CXXFLAGS) + -I.\..\..\..\include $(CPPFLAGS) $(CXXFLAGS) RESOURCE_OBJECTS = \ $(OBJS)\resource_resource.obj SETUPHDIR = \ @@ -171,6 +172,6 @@ clean: -if exist $(OBJS)\resource.ils del $(OBJS)\resource.ils $(OBJS)\resource.exe: $(RESOURCE_OBJECTS) $(OBJS)\resource_resource.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(RESOURCE_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\resource_resource.res | diff --git a/contrib/samples/deprecated/resource/makefile.gcc b/contrib/samples/deprecated/resource/makefile.gcc index f50f57b..ab4b580 100644 --- a/contrib/samples/deprecated/resource/makefile.gcc +++ b/contrib/samples/deprecated/resource/makefile.gcc @@ -14,11 +14,11 @@ include ../../../../build/msw/config.gcc OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -RESOURCE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +RESOURCE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) RESOURCE_OBJECTS = \ $(OBJS)\resource_resource.o \ $(OBJS)\resource_resource_rc.o diff --git a/contrib/samples/deprecated/resource/makefile.vc b/contrib/samples/deprecated/resource/makefile.vc index dcaa159..e489459 100644 --- a/contrib/samples/deprecated/resource/makefile.vc +++ b/contrib/samples/deprecated/resource/makefile.vc @@ -14,13 +14,13 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -RESOURCE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\resource.pdb $(____DEBUGRUNTIME_2_p) \ +RESOURCE_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\resource.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples \ - /I.\..\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) \ - $(__EXCEPTIONSFLAG_9) + /I.\..\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) \ + $(CPPFLAGS) $(CXXFLAGS) RESOURCE_OBJECTS = \ $(OBJS)\resource_resource.obj \ $(OBJS)\resource_resource.res diff --git a/contrib/samples/deprecated/resource/makefile.wat b/contrib/samples/deprecated/resource/makefile.wat index 4447410..af6d910 100644 --- a/contrib/samples/deprecated/resource/makefile.wat +++ b/contrib/samples/deprecated/resource/makefile.wat @@ -169,11 +169,11 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -RESOURCE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +RESOURCE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS) & - $(__EXCEPTIONSFLAG_7) + $(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) RESOURCE_OBJECTS = & $(OBJS)\resource_resource.obj SETUPHDIR = & diff --git a/contrib/samples/deprecated/treelay/Makefile.in b/contrib/samples/deprecated/treelay/Makefile.in index 53c0939..324086d 100644 --- a/contrib/samples/deprecated/treelay/Makefile.in +++ b/contrib/samples/deprecated/treelay/Makefile.in @@ -36,10 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -TREELAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CPPFLAGS) \ - $(CXXFLAGS) +TREELAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ + -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS) TREELAY_OBJECTS = \ $(__treelay_os2_lib_res) \ treelay_treelay.o \ @@ -78,10 +77,10 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \ - $(srcdir)/../../../include -o treelay$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../../samples -i $(srcdir)/../../../include -o \ + treelay$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \ + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -156,7 +155,7 @@ treelay_treelay.o: $(srcdir)/treelay.cpp $(CXXC) -c -o $@ $(TREELAY_CXXFLAGS) $< treelay_treelay_rc.o: $(srcdir)/treelay.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(srcdir)/../../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(srcdir)/../../../include uninstall: diff --git a/contrib/samples/deprecated/treelay/makefile.bcc b/contrib/samples/deprecated/treelay/makefile.bcc index 0f1d3ef..72ec933 100644 --- a/contrib/samples/deprecated/treelay/makefile.bcc +++ b/contrib/samples/deprecated/treelay/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,21 +19,17 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TREELAY_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +TREELAY_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \ -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\..\samples \ - -I.\..\..\..\include $(CXXFLAGS) + -I.\..\..\..\include $(CPPFLAGS) $(CXXFLAGS) TREELAY_OBJECTS = \ $(OBJS)\treelay_treelay.obj @@ -171,6 +172,6 @@ clean: -if exist $(OBJS)\treelay.ils del $(OBJS)\treelay.ils $(OBJS)\treelay.exe: $(TREELAY_OBJECTS) $(OBJS)\treelay_treelay.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(TREELAY_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\treelay_treelay.res | diff --git a/contrib/samples/deprecated/treelay/makefile.gcc b/contrib/samples/deprecated/treelay/makefile.gcc index 121e993..278fb86 100644 --- a/contrib/samples/deprecated/treelay/makefile.gcc +++ b/contrib/samples/deprecated/treelay/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TREELAY_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +TREELAY_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) TREELAY_OBJECTS = \ $(OBJS)\treelay_treelay.o \ $(OBJS)\treelay_treelay_rc.o diff --git a/contrib/samples/deprecated/treelay/makefile.vc b/contrib/samples/deprecated/treelay/makefile.vc index 3dc2ec8..8a0b5d3 100644 --- a/contrib/samples/deprecated/treelay/makefile.vc +++ b/contrib/samples/deprecated/treelay/makefile.vc @@ -16,13 +16,13 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TREELAY_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\treelay.pdb $(____DEBUGRUNTIME_2_p) \ +TREELAY_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\treelay.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples \ - /I.\..\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) \ - $(__EXCEPTIONSFLAG_9) + /I.\..\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) \ + $(CPPFLAGS) $(CXXFLAGS) TREELAY_OBJECTS = \ $(OBJS)\treelay_treelay.obj \ $(OBJS)\treelay_treelay.res diff --git a/contrib/samples/deprecated/treelay/makefile.wat b/contrib/samples/deprecated/treelay/makefile.wat index b710eae..83195d1 100644 --- a/contrib/samples/deprecated/treelay/makefile.wat +++ b/contrib/samples/deprecated/treelay/makefile.wat @@ -171,11 +171,11 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TREELAY_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS) & - $(__EXCEPTIONSFLAG_7) +TREELAY_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\..\samples -i=.\..\..\..\include $(__EXCEPTIONSFLAG_7) & + $(CPPFLAGS) $(CXXFLAGS) TREELAY_OBJECTS = & $(OBJS)\treelay_treelay.obj diff --git a/contrib/samples/fl/Makefile.in b/contrib/samples/fl/Makefile.in index 8a715a3..2e7f0f9 100644 --- a/contrib/samples/fl/Makefile.in +++ b/contrib/samples/fl/Makefile.in @@ -35,41 +35,36 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -FL_DEMO1_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ +FL_DEMO1_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS) FL_DEMO1_OBJECTS = \ $(__fl) \ fl_demo1_fl_demo1.o \ $(__fl_demo1___win32rc) -FL_DEMO2_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ +FL_DEMO2_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS) FL_DEMO2_OBJECTS = \ $(__fl) \ fl_demo2_fl_demo2.o \ $(__fl_demo2___win32rc) -FL_SAMPLE1_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ +FL_SAMPLE1_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS) FL_SAMPLE1_OBJECTS = \ $(__fl) \ fl_sample1_fl_sample1.o \ $(__fl_sample1___win32rc) -FL_SAMPLE2_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ +FL_SAMPLE2_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS) FL_SAMPLE2_OBJECTS = \ $(__fl) \ fl_sample2_fl_sample2.o \ $(__fl_sample2___win32rc) -FL_SAMPLE3_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ +FL_SAMPLE3_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS) FL_SAMPLE3_OBJECTS = \ $(__fl) \ @@ -110,34 +105,34 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_5 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \ - BMP_DIR="bitmaps/" -o fl_demo2$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" \ + -o fl_demo2$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \ + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_5 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_5) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_6 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \ - BMP_DIR="bitmaps/" -o fl_sample2$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" \ + -o fl_sample2$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \ + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_6 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_6) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_7 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \ - BMP_DIR="bitmaps/" -o fl_demo1$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" \ + -o fl_demo1$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \ + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_7 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_7) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_8 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \ - BMP_DIR="bitmaps/" -o fl_sample1$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" \ + -o fl_sample1$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \ + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_8 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_8) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_9 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \ - BMP_DIR="bitmaps/" -o fl_sample3$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" \ + -o fl_sample3$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \ + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_9 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_9) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -255,7 +250,7 @@ fl_demo1_fl_demo1.o: $(srcdir)/fl_demo1.cpp $(CXXC) -c -o $@ $(FL_DEMO1_CXXFLAGS) $< fl_demo1_fl_demo1_rc.o: $(srcdir)/fl_demo1.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_20) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_20) --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" fl_demo2$(EXEEXT): $(FL_DEMO2_OBJECTS) $(__fl_demo2___win32rc) $(CXX) -o $@ $(FL_DEMO2_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) @@ -291,7 +286,7 @@ fl_demo2_fl_demo2.o: $(srcdir)/fl_demo2.cpp $(CXXC) -c -o $@ $(FL_DEMO2_CXXFLAGS) $< fl_demo2_fl_demo2_rc.o: $(srcdir)/fl_demo2.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_20) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_20) --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" fl_sample1$(EXEEXT): $(FL_SAMPLE1_OBJECTS) $(__fl_sample1___win32rc) $(CXX) -o $@ $(FL_SAMPLE1_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) @@ -327,7 +322,7 @@ fl_sample1_fl_sample1.o: $(srcdir)/fl_sample1.cpp $(CXXC) -c -o $@ $(FL_SAMPLE1_CXXFLAGS) $< fl_sample1_fl_sample1_rc.o: $(srcdir)/fl_sample1.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_20) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_20) --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" fl_sample2$(EXEEXT): $(FL_SAMPLE2_OBJECTS) $(__fl_sample2___win32rc) $(CXX) -o $@ $(FL_SAMPLE2_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) @@ -363,7 +358,7 @@ fl_sample2_fl_sample2.o: $(srcdir)/fl_sample2.cpp $(CXXC) -c -o $@ $(FL_SAMPLE2_CXXFLAGS) $< fl_sample2_fl_sample2_rc.o: $(srcdir)/fl_sample2.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_20) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_20) --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" fl_sample3$(EXEEXT): $(FL_SAMPLE3_OBJECTS) $(__fl_sample3___win32rc) $(CXX) -o $@ $(FL_SAMPLE3_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) @@ -399,7 +394,7 @@ fl_sample3_fl_sample3.o: $(srcdir)/fl_sample3.cpp $(CXXC) -c -o $@ $(FL_SAMPLE3_CXXFLAGS) $< fl_sample3_fl_sample3_rc.o: $(srcdir)/fl_sample3.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_20) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_20) --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" install: all diff --git a/contrib/samples/fl/makefile.bcc b/contrib/samples/fl/makefile.bcc index 56c022e..30de658 100644 --- a/contrib/samples/fl/makefile.bcc +++ b/contrib/samples/fl/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,45 +19,41 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -FL_DEMO1_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_3) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \ - -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) +FL_DEMO1_CXXFLAGS = $(__RUNTIME_LIBS_3) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \ + -I.\..\..\..\samples -I.\..\..\include -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) \ + $(CXXFLAGS) FL_DEMO1_OBJECTS = \ $(OBJS)\fl_demo1_fl_demo1.obj -FL_DEMO2_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_3) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \ - -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) +FL_DEMO2_CXXFLAGS = $(__RUNTIME_LIBS_3) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \ + -I.\..\..\..\samples -I.\..\..\include -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) \ + $(CXXFLAGS) FL_DEMO2_OBJECTS = \ $(OBJS)\fl_demo2_fl_demo2.obj -FL_SAMPLE1_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_3) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \ - -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) +FL_SAMPLE1_CXXFLAGS = $(__RUNTIME_LIBS_3) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \ + -I.\..\..\..\samples -I.\..\..\include -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) \ + $(CXXFLAGS) FL_SAMPLE1_OBJECTS = \ $(OBJS)\fl_sample1_fl_sample1.obj -FL_SAMPLE2_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_3) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \ - -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) +FL_SAMPLE2_CXXFLAGS = $(__RUNTIME_LIBS_3) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \ + -I.\..\..\..\samples -I.\..\..\include -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) \ + $(CXXFLAGS) FL_SAMPLE2_OBJECTS = \ $(OBJS)\fl_sample2_fl_sample2.obj -FL_SAMPLE3_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_3) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \ - -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) +FL_SAMPLE3_CXXFLAGS = $(__RUNTIME_LIBS_3) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \ + -I.\..\..\..\samples -I.\..\..\include -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) \ + $(CXXFLAGS) FL_SAMPLE3_OBJECTS = \ $(OBJS)\fl_sample3_fl_sample3.obj OBJS = \ @@ -251,26 +252,26 @@ data_files: for %f in (bookmarks.bmp class_icon.bmp class_icon1.bmp copy.bmp cut.bmp file_icon.bmp folder_icon.bmp help_icon.bmp new.bmp nextmark.bmp open.bmp paste.bmp prevmark.bmp res_icon.bmp save.bmp saveall.bmp search.bmp start95_dp.bmp start95_pr.bmp tile.bmp) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps $(OBJS)\fl_demo1.exe: $(FL_DEMO1_OBJECTS) $(OBJS)\fl_demo1_fl_demo1.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(FL_DEMO1_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS).lib,, $(OBJS)\fl_demo1_fl_demo1.res | $(OBJS)\fl_demo2.exe: $(FL_DEMO2_OBJECTS) $(OBJS)\fl_demo2_fl_demo2.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(FL_DEMO2_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS).lib,, $(OBJS)\fl_demo2_fl_demo2.res | $(OBJS)\fl_sample1.exe: $(FL_SAMPLE1_OBJECTS) $(OBJS)\fl_sample1_fl_sample1.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(FL_SAMPLE1_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS).lib,, $(OBJS)\fl_sample1_fl_sample1.res | $(OBJS)\fl_sample2.exe: $(FL_SAMPLE2_OBJECTS) $(OBJS)\fl_sample2_fl_sample2.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(FL_SAMPLE2_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS).lib,, $(OBJS)\fl_sample2_fl_sample2.res | $(OBJS)\fl_sample3.exe: $(FL_SAMPLE3_OBJECTS) $(OBJS)\fl_sample3_fl_sample3.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(FL_SAMPLE3_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS).lib,, $(OBJS)\fl_sample3_fl_sample3.res | diff --git a/contrib/samples/fl/makefile.gcc b/contrib/samples/fl/makefile.gcc index f0d088c..11aa95d 100644 --- a/contrib/samples/fl/makefile.gcc +++ b/contrib/samples/fl/makefile.gcc @@ -12,48 +12,48 @@ include ../../../build/msw/config.gcc ### Variables: ### -FL_DEMO1_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ +FL_DEMO1_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \ - -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_1) + -DBMP_DIR=\"bitmaps/\" $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1) \ + $(CPPFLAGS) $(CXXFLAGS) FL_DEMO1_OBJECTS = \ $(OBJS)\fl_demo1_fl_demo1.o \ $(OBJS)\fl_demo1_fl_demo1_rc.o -FL_DEMO2_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ +FL_DEMO2_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \ - -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_1) + -DBMP_DIR=\"bitmaps/\" $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1) \ + $(CPPFLAGS) $(CXXFLAGS) FL_DEMO2_OBJECTS = \ $(OBJS)\fl_demo2_fl_demo2.o \ $(OBJS)\fl_demo2_fl_demo2_rc.o -FL_SAMPLE1_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ +FL_SAMPLE1_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \ - -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_1) + -DBMP_DIR=\"bitmaps/\" $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1) \ + $(CPPFLAGS) $(CXXFLAGS) FL_SAMPLE1_OBJECTS = \ $(OBJS)\fl_sample1_fl_sample1.o \ $(OBJS)\fl_sample1_fl_sample1_rc.o -FL_SAMPLE2_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ +FL_SAMPLE2_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \ - -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_1) + -DBMP_DIR=\"bitmaps/\" $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1) \ + $(CPPFLAGS) $(CXXFLAGS) FL_SAMPLE2_OBJECTS = \ $(OBJS)\fl_sample2_fl_sample2.o \ $(OBJS)\fl_sample2_fl_sample2_rc.o -FL_SAMPLE3_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ +FL_SAMPLE3_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \ - -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_1) + -DBMP_DIR=\"bitmaps/\" $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_1) \ + $(CPPFLAGS) $(CXXFLAGS) FL_SAMPLE3_OBJECTS = \ $(OBJS)\fl_sample3_fl_sample3.o \ $(OBJS)\fl_sample3_fl_sample3_rc.o diff --git a/contrib/samples/fl/makefile.vc b/contrib/samples/fl/makefile.vc index 63f0bb4..0cfe7b1 100644 --- a/contrib/samples/fl/makefile.vc +++ b/contrib/samples/fl/makefile.vc @@ -12,53 +12,53 @@ ### Variables: ### -FL_DEMO1_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ +FL_DEMO1_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_8) /Fd$(OBJS)\fl_demo1.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - /I.\..\..\include /DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_3) + /I.\..\..\include /DBMP_DIR=\"bitmaps/\" $(__EXCEPTIONSFLAG) \ + $(__EXCEPTIONSFLAG_3) $(CPPFLAGS) $(CXXFLAGS) FL_DEMO1_OBJECTS = \ $(OBJS)\fl_demo1_fl_demo1.obj \ $(OBJS)\fl_demo1_fl_demo1.res -FL_DEMO2_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_16) \ - /DWIN32 $(__DEBUGINFO_8) /Fd$(OBJS)\fl_demo2.pdb $(____DEBUGRUNTIME_15_p) \ +FL_DEMO2_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_16) /DWIN32 \ + $(__DEBUGINFO_8) /Fd$(OBJS)\fl_demo2.pdb $(____DEBUGRUNTIME_15_p) \ $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - /I.\..\..\include /DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_3) + /I.\..\..\include /DBMP_DIR=\"bitmaps/\" $(__EXCEPTIONSFLAG) \ + $(__EXCEPTIONSFLAG_3) $(CPPFLAGS) $(CXXFLAGS) FL_DEMO2_OBJECTS = \ $(OBJS)\fl_demo2_fl_demo2.obj \ $(OBJS)\fl_demo2_fl_demo2.res -FL_SAMPLE1_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_29) \ - /DWIN32 $(__DEBUGINFO_8) /Fd$(OBJS)\fl_sample1.pdb $(____DEBUGRUNTIME_28_p) \ +FL_SAMPLE1_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_29) /DWIN32 \ + $(__DEBUGINFO_8) /Fd$(OBJS)\fl_sample1.pdb $(____DEBUGRUNTIME_28_p) \ $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - /I.\..\..\include /DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_3) + /I.\..\..\include /DBMP_DIR=\"bitmaps/\" $(__EXCEPTIONSFLAG) \ + $(__EXCEPTIONSFLAG_3) $(CPPFLAGS) $(CXXFLAGS) FL_SAMPLE1_OBJECTS = \ $(OBJS)\fl_sample1_fl_sample1.obj \ $(OBJS)\fl_sample1_fl_sample1.res -FL_SAMPLE2_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_42) \ - /DWIN32 $(__DEBUGINFO_8) /Fd$(OBJS)\fl_sample2.pdb $(____DEBUGRUNTIME_41_p) \ +FL_SAMPLE2_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_42) /DWIN32 \ + $(__DEBUGINFO_8) /Fd$(OBJS)\fl_sample2.pdb $(____DEBUGRUNTIME_41_p) \ $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - /I.\..\..\include /DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_3) + /I.\..\..\include /DBMP_DIR=\"bitmaps/\" $(__EXCEPTIONSFLAG) \ + $(__EXCEPTIONSFLAG_3) $(CPPFLAGS) $(CXXFLAGS) FL_SAMPLE2_OBJECTS = \ $(OBJS)\fl_sample2_fl_sample2.obj \ $(OBJS)\fl_sample2_fl_sample2.res -FL_SAMPLE3_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_55) \ - /DWIN32 $(__DEBUGINFO_8) /Fd$(OBJS)\fl_sample3.pdb $(____DEBUGRUNTIME_54_p) \ +FL_SAMPLE3_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_55) /DWIN32 \ + $(__DEBUGINFO_8) /Fd$(OBJS)\fl_sample3.pdb $(____DEBUGRUNTIME_54_p) \ $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - /I.\..\..\include /DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) $(__EXCEPTIONSFLAG) \ - $(__EXCEPTIONSFLAG_3) + /I.\..\..\include /DBMP_DIR=\"bitmaps/\" $(__EXCEPTIONSFLAG) \ + $(__EXCEPTIONSFLAG_3) $(CPPFLAGS) $(CXXFLAGS) FL_SAMPLE3_OBJECTS = \ $(OBJS)\fl_sample3_fl_sample3.obj \ $(OBJS)\fl_sample3_fl_sample3.res diff --git a/contrib/samples/fl/makefile.wat b/contrib/samples/fl/makefile.wat index 7a9b3c5..d10a54d 100644 --- a/contrib/samples/fl/makefile.wat +++ b/contrib/samples/fl/makefile.wat @@ -167,39 +167,39 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -FL_DEMO1_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include & - -dBMP_DIR="bitmaps/" $(CXXFLAGS) $(__EXCEPTIONSFLAG) +FL_DEMO1_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -i=.\..\..\include -dBMP_DIR="bitmaps/" & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) FL_DEMO1_OBJECTS = & $(OBJS)\fl_demo1_fl_demo1.obj -FL_DEMO2_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include & - -dBMP_DIR="bitmaps/" $(CXXFLAGS) $(__EXCEPTIONSFLAG) +FL_DEMO2_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -i=.\..\..\include -dBMP_DIR="bitmaps/" & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) FL_DEMO2_OBJECTS = & $(OBJS)\fl_demo2_fl_demo2.obj -FL_SAMPLE1_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include & - -dBMP_DIR="bitmaps/" $(CXXFLAGS) $(__EXCEPTIONSFLAG) +FL_SAMPLE1_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -i=.\..\..\include -dBMP_DIR="bitmaps/" & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) FL_SAMPLE1_OBJECTS = & $(OBJS)\fl_sample1_fl_sample1.obj -FL_SAMPLE2_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include & - -dBMP_DIR="bitmaps/" $(CXXFLAGS) $(__EXCEPTIONSFLAG) +FL_SAMPLE2_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -i=.\..\..\include -dBMP_DIR="bitmaps/" & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) FL_SAMPLE2_OBJECTS = & $(OBJS)\fl_sample2_fl_sample2.obj -FL_SAMPLE3_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include & - -dBMP_DIR="bitmaps/" $(CXXFLAGS) $(__EXCEPTIONSFLAG) +FL_SAMPLE3_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -i=.\..\..\include -dBMP_DIR="bitmaps/" & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) FL_SAMPLE3_OBJECTS = & $(OBJS)\fl_sample3_fl_sample3.obj OBJS = & diff --git a/contrib/samples/gizmos/dynsash/Makefile.in b/contrib/samples/gizmos/dynsash/Makefile.in index 2026cba..e4c4337 100644 --- a/contrib/samples/gizmos/dynsash/Makefile.in +++ b/contrib/samples/gizmos/dynsash/Makefile.in @@ -36,10 +36,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -DYNSASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CPPFLAGS) \ - $(CXXFLAGS) +DYNSASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ + -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS) DYNSASH_OBJECTS = \ $(__dynsash___win32rc) \ $(__dynsash_os2_lib_res) \ @@ -79,10 +78,10 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \ - $(srcdir)/../../../include -o dynsash$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../../samples -i $(srcdir)/../../../include -o \ + dynsash$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \ + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -156,7 +155,7 @@ dynsash_dynsash.o: $(srcdir)/dynsash.cpp $(CXXC) -c -o $@ $(DYNSASH_CXXFLAGS) $< dynsash_sample_rc.o: $(srcdir)/../../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples install: all diff --git a/contrib/samples/gizmos/dynsash/makefile.bcc b/contrib/samples/gizmos/dynsash/makefile.bcc index ffcd172..e7bea3d 100644 --- a/contrib/samples/gizmos/dynsash/makefile.bcc +++ b/contrib/samples/gizmos/dynsash/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,17 +19,13 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -DYNSASH_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +DYNSASH_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \ -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\..\samples \ - -I.\..\..\..\include $(CXXFLAGS) + -I.\..\..\..\include $(CPPFLAGS) $(CXXFLAGS) DYNSASH_OBJECTS = \ $(OBJS)\dynsash_dynsash.obj OBJS = \ @@ -175,6 +176,6 @@ clean: -if exist $(OBJS)\dynsash.ils del $(OBJS)\dynsash.ils $(OBJS)\dynsash.exe: $(DYNSASH_OBJECTS) $(OBJS)\dynsash_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(DYNSASH_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\dynsash_sample.res | diff --git a/contrib/samples/gizmos/dynsash/makefile.gcc b/contrib/samples/gizmos/dynsash/makefile.gcc index b9ad9ab..e668f3e 100644 --- a/contrib/samples/gizmos/dynsash/makefile.gcc +++ b/contrib/samples/gizmos/dynsash/makefile.gcc @@ -12,11 +12,11 @@ include ../../../../build/msw/config.gcc ### Variables: ### -DYNSASH_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +DYNSASH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) DYNSASH_OBJECTS = \ $(OBJS)\dynsash_sample_rc.o \ $(OBJS)\dynsash_dynsash.o diff --git a/contrib/samples/gizmos/dynsash/makefile.vc b/contrib/samples/gizmos/dynsash/makefile.vc index 5af209b..805f3d2 100644 --- a/contrib/samples/gizmos/dynsash/makefile.vc +++ b/contrib/samples/gizmos/dynsash/makefile.vc @@ -12,13 +12,13 @@ ### Variables: ### -DYNSASH_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\dynsash.pdb $(____DEBUGRUNTIME_2_p) \ +DYNSASH_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\dynsash.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples \ - /I.\..\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) \ - $(__EXCEPTIONSFLAG_9) + /I.\..\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) \ + $(CPPFLAGS) $(CXXFLAGS) DYNSASH_OBJECTS = \ $(OBJS)\dynsash_sample.res \ $(OBJS)\dynsash_dynsash.obj diff --git a/contrib/samples/gizmos/dynsash/makefile.wat b/contrib/samples/gizmos/dynsash/makefile.wat index 2042b91..a4c1e6d 100644 --- a/contrib/samples/gizmos/dynsash/makefile.wat +++ b/contrib/samples/gizmos/dynsash/makefile.wat @@ -172,11 +172,11 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -DYNSASH_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS) & - $(__EXCEPTIONSFLAG_7) +DYNSASH_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\..\samples -i=.\..\..\..\include $(__EXCEPTIONSFLAG_7) & + $(CPPFLAGS) $(CXXFLAGS) DYNSASH_OBJECTS = & $(OBJS)\dynsash_dynsash.obj OBJS = & diff --git a/contrib/samples/gizmos/dynsash_switch/Makefile.in b/contrib/samples/gizmos/dynsash_switch/Makefile.in index 82986c3..d147643 100644 --- a/contrib/samples/gizmos/dynsash_switch/Makefile.in +++ b/contrib/samples/gizmos/dynsash_switch/Makefile.in @@ -35,10 +35,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -DYNSASH_SWITCH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CPPFLAGS) \ - $(CXXFLAGS) +DYNSASH_SWITCH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ + -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS) DYNSASH_SWITCH_OBJECTS = \ $(__dynsash_switch___win32rc) \ $(__dynsash_switch_os2_lib_res) \ @@ -78,10 +77,10 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \ - $(srcdir)/../../../include -o dynsash_switch$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../../samples -i $(srcdir)/../../../include -o \ + dynsash_switch$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \ + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -156,7 +155,7 @@ dynsash_switch_dynsash_switch.o: $(srcdir)/dynsash_switch.cpp $(CXXC) -c -o $@ $(DYNSASH_SWITCH_CXXFLAGS) $< dynsash_switch_sample_rc.o: $(srcdir)/../../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples install: all diff --git a/contrib/samples/gizmos/dynsash_switch/makefile.bcc b/contrib/samples/gizmos/dynsash_switch/makefile.bcc index 1cd6525..dbd11df 100644 --- a/contrib/samples/gizmos/dynsash_switch/makefile.bcc +++ b/contrib/samples/gizmos/dynsash_switch/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,17 +19,13 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -DYNSASH_SWITCH_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ +DYNSASH_SWITCH_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \ -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\..\samples \ - -I.\..\..\..\include $(CXXFLAGS) + -I.\..\..\..\include $(CPPFLAGS) $(CXXFLAGS) DYNSASH_SWITCH_OBJECTS = \ $(OBJS)\dynsash_switch_dynsash_switch.obj OBJS = \ @@ -171,6 +172,6 @@ clean: -if exist $(OBJS)\dynsash_switch.ils del $(OBJS)\dynsash_switch.ils $(OBJS)\dynsash_switch.exe: $(DYNSASH_SWITCH_OBJECTS) $(OBJS)\dynsash_switch_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(DYNSASH_SWITCH_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\dynsash_switch_sample.res | diff --git a/contrib/samples/gizmos/dynsash_switch/makefile.gcc b/contrib/samples/gizmos/dynsash_switch/makefile.gcc index 86b3249..37d4a00 100644 --- a/contrib/samples/gizmos/dynsash_switch/makefile.gcc +++ b/contrib/samples/gizmos/dynsash_switch/makefile.gcc @@ -12,12 +12,11 @@ include ../../../../build/msw/config.gcc ### Variables: ### -DYNSASH_SWITCH_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \ - -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\..\..\samples \ - -I.\..\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +DYNSASH_SWITCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ + $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) DYNSASH_SWITCH_OBJECTS = \ $(OBJS)\dynsash_switch_sample_rc.o \ $(OBJS)\dynsash_switch_dynsash_switch.o diff --git a/contrib/samples/gizmos/dynsash_switch/makefile.vc b/contrib/samples/gizmos/dynsash_switch/makefile.vc index 3074791..3c91b93 100644 --- a/contrib/samples/gizmos/dynsash_switch/makefile.vc +++ b/contrib/samples/gizmos/dynsash_switch/makefile.vc @@ -12,13 +12,13 @@ ### Variables: ### -DYNSASH_SWITCH_CXXFLAGS = $(CPPFLAGS) \ - /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 $(__DEBUGINFO_0) \ - /Fd$(OBJS)\dynsash_switch.pdb $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG_4) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) /I.\..\..\..\..\include /I$(SETUPHDIR) /W4 /I. \ - $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples /I.\..\..\..\include \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) +DYNSASH_SWITCH_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\dynsash_switch.pdb $(____DEBUGRUNTIME_2_p) \ + $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\..\include \ + /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples \ + /I.\..\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) \ + $(CPPFLAGS) $(CXXFLAGS) DYNSASH_SWITCH_OBJECTS = \ $(OBJS)\dynsash_switch_sample.res \ $(OBJS)\dynsash_switch_dynsash_switch.obj diff --git a/contrib/samples/gizmos/dynsash_switch/makefile.wat b/contrib/samples/gizmos/dynsash_switch/makefile.wat index abef342..9bcbabb 100644 --- a/contrib/samples/gizmos/dynsash_switch/makefile.wat +++ b/contrib/samples/gizmos/dynsash_switch/makefile.wat @@ -167,11 +167,11 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -DYNSASH_SWITCH_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +DYNSASH_SWITCH_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS) & - $(__EXCEPTIONSFLAG_7) + $(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) DYNSASH_SWITCH_OBJECTS = & $(OBJS)\dynsash_switch_dynsash_switch.obj OBJS = & diff --git a/contrib/samples/gizmos/editlbox/Makefile.in b/contrib/samples/gizmos/editlbox/Makefile.in index d3a3a6d..92d5e33 100644 --- a/contrib/samples/gizmos/editlbox/Makefile.in +++ b/contrib/samples/gizmos/editlbox/Makefile.in @@ -36,10 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CPPFLAGS) \ - $(CXXFLAGS) +TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ + -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = \ $(__test___win32rc) \ $(__test_os2_lib_res) \ @@ -78,10 +77,9 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \ - $(srcdir)/../../../include -o test$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../../samples -i $(srcdir)/../../../include -o test$(EXEEXT) \ + Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -153,7 +151,7 @@ test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@test_bundle: test.app/Contents/PkgInfo test_sample_rc.o: $(srcdir)/../../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples test_test.o: $(srcdir)/test.cpp $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< diff --git a/contrib/samples/gizmos/editlbox/makefile.bcc b/contrib/samples/gizmos/editlbox/makefile.bcc index 6999c97..6f53b6d 100644 --- a/contrib/samples/gizmos/editlbox/makefile.bcc +++ b/contrib/samples/gizmos/editlbox/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,21 +19,17 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +TEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \ -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\..\samples \ - -I.\..\..\..\include $(CXXFLAGS) + -I.\..\..\..\include $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = \ $(OBJS)\test_test.obj @@ -171,6 +172,6 @@ clean: -if exist $(OBJS)\test.ils del $(OBJS)\test.ils $(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(TEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\test_sample.res | diff --git a/contrib/samples/gizmos/editlbox/makefile.gcc b/contrib/samples/gizmos/editlbox/makefile.gcc index d93706a..7758d5a 100644 --- a/contrib/samples/gizmos/editlbox/makefile.gcc +++ b/contrib/samples/gizmos/editlbox/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) +TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) \ + -I.\..\..\..\..\samples -I.\..\..\..\include $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = \ $(OBJS)\test_sample_rc.o \ $(OBJS)\test_test.o diff --git a/contrib/samples/gizmos/editlbox/makefile.vc b/contrib/samples/gizmos/editlbox/makefile.vc index 7a87708..b9d9bb4 100644 --- a/contrib/samples/gizmos/editlbox/makefile.vc +++ b/contrib/samples/gizmos/editlbox/makefile.vc @@ -16,13 +16,13 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\test.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples \ - /I.\..\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) \ - $(__EXCEPTIONSFLAG_9) + /I.\..\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) \ + $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = \ $(OBJS)\test_sample.res \ $(OBJS)\test_test.obj diff --git a/contrib/samples/gizmos/editlbox/makefile.wat b/contrib/samples/gizmos/editlbox/makefile.wat index 008ee4b..8fde08f 100644 --- a/contrib/samples/gizmos/editlbox/makefile.wat +++ b/contrib/samples/gizmos/editlbox/makefile.wat @@ -171,11 +171,11 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS) & - $(__EXCEPTIONSFLAG_7) +TEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\..\samples -i=.\..\..\..\include $(__EXCEPTIONSFLAG_7) & + $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = & $(OBJS)\test_test.obj diff --git a/contrib/samples/gizmos/led/Makefile.in b/contrib/samples/gizmos/led/Makefile.in index 449460c..99f8be3 100644 --- a/contrib/samples/gizmos/led/Makefile.in +++ b/contrib/samples/gizmos/led/Makefile.in @@ -35,8 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -LED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \ - -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ +LED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS) LED_OBJECTS = \ $(__led___win32rc) \ @@ -77,10 +77,9 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \ - $(srcdir)/../../../include -o led$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../../samples -i $(srcdir)/../../../include -o led$(EXEEXT) \ + Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -154,7 +153,7 @@ led_led.o: $(srcdir)/led.cpp $(CXXC) -c -o $@ $(LED_CXXFLAGS) $< led_sample_rc.o: $(srcdir)/../../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples uninstall: diff --git a/contrib/samples/gizmos/led/makefile.bcc b/contrib/samples/gizmos/led/makefile.bcc index 844d28f..f9b1967 100644 --- a/contrib/samples/gizmos/led/makefile.bcc +++ b/contrib/samples/gizmos/led/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,17 +19,13 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -LED_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +LED_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \ -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\..\samples \ - -I.\..\..\..\include $(CXXFLAGS) + -I.\..\..\..\include $(CPPFLAGS) $(CXXFLAGS) LED_OBJECTS = \ $(OBJS)\led_led.obj OBJS = \ @@ -171,6 +172,6 @@ clean: -if exist $(OBJS)\led.ils del $(OBJS)\led.ils $(OBJS)\led.exe: $(LED_OBJECTS) $(OBJS)\led_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(LED_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\led_sample.res | diff --git a/contrib/samples/gizmos/led/makefile.gcc b/contrib/samples/gizmos/led/makefile.gcc index 7a2afe6..f308561 100644 --- a/contrib/samples/gizmos/led/makefile.gcc +++ b/contrib/samples/gizmos/led/makefile.gcc @@ -12,11 +12,11 @@ include ../../../../build/msw/config.gcc ### Variables: ### -LED_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) +LED_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) \ + -I.\..\..\..\..\samples -I.\..\..\..\include $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) LED_OBJECTS = \ $(OBJS)\led_sample_rc.o \ $(OBJS)\led_led.o diff --git a/contrib/samples/gizmos/led/makefile.vc b/contrib/samples/gizmos/led/makefile.vc index a0649b9..e65b486 100644 --- a/contrib/samples/gizmos/led/makefile.vc +++ b/contrib/samples/gizmos/led/makefile.vc @@ -12,13 +12,13 @@ ### Variables: ### -LED_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +LED_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\led.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples \ - /I.\..\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) \ - $(__EXCEPTIONSFLAG_9) + /I.\..\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) \ + $(CPPFLAGS) $(CXXFLAGS) LED_OBJECTS = \ $(OBJS)\led_sample.res \ $(OBJS)\led_led.obj diff --git a/contrib/samples/gizmos/led/makefile.wat b/contrib/samples/gizmos/led/makefile.wat index fda9cb2..fdaa7c1 100644 --- a/contrib/samples/gizmos/led/makefile.wat +++ b/contrib/samples/gizmos/led/makefile.wat @@ -167,11 +167,11 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -LED_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS) & - $(__EXCEPTIONSFLAG_7) +LED_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\..\samples -i=.\..\..\..\include $(__EXCEPTIONSFLAG_7) & + $(CPPFLAGS) $(CXXFLAGS) LED_OBJECTS = & $(OBJS)\led_led.obj OBJS = & diff --git a/contrib/samples/gizmos/multicell/Makefile.in b/contrib/samples/gizmos/multicell/Makefile.in index e616a1e..e12995f 100644 --- a/contrib/samples/gizmos/multicell/Makefile.in +++ b/contrib/samples/gizmos/multicell/Makefile.in @@ -36,10 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -MTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CPPFLAGS) \ - $(CXXFLAGS) +MTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ + -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS) MTEST_OBJECTS = \ $(__mtest___win32rc) \ $(__mtest_os2_lib_res) \ @@ -78,10 +77,9 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \ - $(srcdir)/../../../include -o mtest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../../samples -i $(srcdir)/../../../include -o \ + mtest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -156,7 +154,7 @@ mtest_mtest.o: $(srcdir)/mtest.cpp $(CXXC) -c -o $@ $(MTEST_CXXFLAGS) $< mtest_sample_rc.o: $(srcdir)/../../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples uninstall: diff --git a/contrib/samples/gizmos/multicell/makefile.bcc b/contrib/samples/gizmos/multicell/makefile.bcc index 50e228e..c23eaaa 100644 --- a/contrib/samples/gizmos/multicell/makefile.bcc +++ b/contrib/samples/gizmos/multicell/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,17 +19,13 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -MTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +MTEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \ -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\..\samples \ - -I.\..\..\..\include $(CXXFLAGS) + -I.\..\..\..\include $(CPPFLAGS) $(CXXFLAGS) MTEST_OBJECTS = \ $(OBJS)\mtest_mtest.obj OBJS = \ @@ -171,6 +172,6 @@ clean: -if exist $(OBJS)\mtest.ils del $(OBJS)\mtest.ils $(OBJS)\mtest.exe: $(MTEST_OBJECTS) $(OBJS)\mtest_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(MTEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\mtest_sample.res | diff --git a/contrib/samples/gizmos/multicell/makefile.gcc b/contrib/samples/gizmos/multicell/makefile.gcc index 281c2ce..ca7cf68 100644 --- a/contrib/samples/gizmos/multicell/makefile.gcc +++ b/contrib/samples/gizmos/multicell/makefile.gcc @@ -12,11 +12,11 @@ include ../../../../build/msw/config.gcc ### Variables: ### -MTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) +MTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) \ + -I.\..\..\..\..\samples -I.\..\..\..\include $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) MTEST_OBJECTS = \ $(OBJS)\mtest_sample_rc.o \ $(OBJS)\mtest_mtest.o diff --git a/contrib/samples/gizmos/multicell/makefile.vc b/contrib/samples/gizmos/multicell/makefile.vc index 84440e0..555a500 100644 --- a/contrib/samples/gizmos/multicell/makefile.vc +++ b/contrib/samples/gizmos/multicell/makefile.vc @@ -12,13 +12,13 @@ ### Variables: ### -MTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +MTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\mtest.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples \ - /I.\..\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) \ - $(__EXCEPTIONSFLAG_9) + /I.\..\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) \ + $(CPPFLAGS) $(CXXFLAGS) MTEST_OBJECTS = \ $(OBJS)\mtest_sample.res \ $(OBJS)\mtest_mtest.obj diff --git a/contrib/samples/gizmos/multicell/makefile.wat b/contrib/samples/gizmos/multicell/makefile.wat index 1e7c2e2..214f9bf 100644 --- a/contrib/samples/gizmos/multicell/makefile.wat +++ b/contrib/samples/gizmos/multicell/makefile.wat @@ -167,11 +167,11 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -MTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS) & - $(__EXCEPTIONSFLAG_7) +MTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\..\samples -i=.\..\..\..\include $(__EXCEPTIONSFLAG_7) & + $(CPPFLAGS) $(CXXFLAGS) MTEST_OBJECTS = & $(OBJS)\mtest_mtest.obj OBJS = & diff --git a/contrib/samples/gizmos/splittree/Makefile.in b/contrib/samples/gizmos/splittree/Makefile.in index 89ab5a9..693036e 100644 --- a/contrib/samples/gizmos/splittree/Makefile.in +++ b/contrib/samples/gizmos/splittree/Makefile.in @@ -36,10 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -SPLITTREE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CPPFLAGS) \ - $(CXXFLAGS) +SPLITTREE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ + -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS) SPLITTREE_OBJECTS = \ $(__splittree___win32rc) \ $(__splittree_os2_lib_res) \ @@ -78,10 +77,10 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \ - $(srcdir)/../../../include -o splittree$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../../samples -i $(srcdir)/../../../include -o \ + splittree$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \ + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -153,7 +152,7 @@ splittree.app/Contents/PkgInfo: splittree$(EXEEXT) $(top_srcdir)/src/mac/Info.pl @COND_PLATFORM_MACOSX_1@splittree_bundle: splittree.app/Contents/PkgInfo splittree_sample_rc.o: $(srcdir)/../../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples splittree_tree.o: $(srcdir)/tree.cpp $(CXXC) -c -o $@ $(SPLITTREE_CXXFLAGS) $< diff --git a/contrib/samples/gizmos/splittree/makefile.bcc b/contrib/samples/gizmos/splittree/makefile.bcc index bd84399..fbad8c1 100644 --- a/contrib/samples/gizmos/splittree/makefile.bcc +++ b/contrib/samples/gizmos/splittree/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,21 +19,17 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SPLITTREE_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +SPLITTREE_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \ -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\..\samples \ - -I.\..\..\..\include $(CXXFLAGS) + -I.\..\..\..\include $(CPPFLAGS) $(CXXFLAGS) SPLITTREE_OBJECTS = \ $(OBJS)\splittree_tree.obj @@ -171,6 +172,6 @@ clean: -if exist $(OBJS)\splittree.ils del $(OBJS)\splittree.ils $(OBJS)\splittree.exe: $(SPLITTREE_OBJECTS) $(OBJS)\splittree_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(SPLITTREE_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\splittree_sample.res | diff --git a/contrib/samples/gizmos/splittree/makefile.gcc b/contrib/samples/gizmos/splittree/makefile.gcc index 16ea77a..6ad3651 100644 --- a/contrib/samples/gizmos/splittree/makefile.gcc +++ b/contrib/samples/gizmos/splittree/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SPLITTREE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +SPLITTREE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) SPLITTREE_OBJECTS = \ $(OBJS)\splittree_sample_rc.o \ $(OBJS)\splittree_tree.o diff --git a/contrib/samples/gizmos/splittree/makefile.vc b/contrib/samples/gizmos/splittree/makefile.vc index cef39cf..ff908a4 100644 --- a/contrib/samples/gizmos/splittree/makefile.vc +++ b/contrib/samples/gizmos/splittree/makefile.vc @@ -16,13 +16,13 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SPLITTREE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\splittree.pdb $(____DEBUGRUNTIME_2_p) \ +SPLITTREE_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\splittree.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples \ - /I.\..\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) \ - $(__EXCEPTIONSFLAG_9) + /I.\..\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) \ + $(CPPFLAGS) $(CXXFLAGS) SPLITTREE_OBJECTS = \ $(OBJS)\splittree_sample.res \ $(OBJS)\splittree_tree.obj diff --git a/contrib/samples/gizmos/splittree/makefile.wat b/contrib/samples/gizmos/splittree/makefile.wat index 9cbda95..ff3b62c 100644 --- a/contrib/samples/gizmos/splittree/makefile.wat +++ b/contrib/samples/gizmos/splittree/makefile.wat @@ -171,11 +171,11 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SPLITTREE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +SPLITTREE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS) & - $(__EXCEPTIONSFLAG_7) + $(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) SPLITTREE_OBJECTS = & $(OBJS)\splittree_tree.obj diff --git a/contrib/samples/mmedia/Makefile.in b/contrib/samples/mmedia/Makefile.in index e76ed05..9ddca3b 100644 --- a/contrib/samples/mmedia/Makefile.in +++ b/contrib/samples/mmedia/Makefile.in @@ -37,10 +37,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -MMBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \ - $(CXXFLAGS) +MMBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ + $(CPPFLAGS) $(CXXFLAGS) MMBOARD_OBJECTS = \ $(__mmboard_os2_lib_res) \ mmboard_mmboard.o \ @@ -80,10 +79,9 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \ - mmboard$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \ - sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -i $(srcdir)/../../include -o mmboard$(EXEEXT) \ + Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -161,7 +159,7 @@ mmboard_mmboard.o: $(srcdir)/mmboard.cpp $(CXXC) -c -o $@ $(MMBOARD_CXXFLAGS) $< mmboard_mmboard_rc.o: $(srcdir)/mmboard.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include uninstall: diff --git a/contrib/samples/mmedia/makefile.bcc b/contrib/samples/mmedia/makefile.bcc index 163ebea..d8dd86c 100644 --- a/contrib/samples/mmedia/makefile.bcc +++ b/contrib/samples/mmedia/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,17 +19,13 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -MMBOARD_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +MMBOARD_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \ - $(CXXFLAGS) + $(CPPFLAGS) $(CXXFLAGS) MMBOARD_OBJECTS = \ $(OBJS)\mmboard_mmboard.obj \ $(OBJS)\mmboard_mmbman.obj @@ -175,6 +176,6 @@ clean: -if exist $(OBJS)\mmboard.ils del $(OBJS)\mmboard.ils $(OBJS)\mmboard.exe: $(MMBOARD_OBJECTS) $(OBJS)\mmboard_mmboard.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(MMBOARD_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\mmboard_mmboard.res | diff --git a/contrib/samples/mmedia/makefile.gcc b/contrib/samples/mmedia/makefile.gcc index 884319c..9fb3fb3 100644 --- a/contrib/samples/mmedia/makefile.gcc +++ b/contrib/samples/mmedia/makefile.gcc @@ -12,11 +12,11 @@ include ../../../build/msw/config.gcc ### Variables: ### -MMBOARD_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +MMBOARD_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) MMBOARD_OBJECTS = \ $(OBJS)\mmboard_mmboard.o \ $(OBJS)\mmboard_mmbman.o \ diff --git a/contrib/samples/mmedia/makefile.vc b/contrib/samples/mmedia/makefile.vc index 0c0d818..cdb3b05 100644 --- a/contrib/samples/mmedia/makefile.vc +++ b/contrib/samples/mmedia/makefile.vc @@ -12,12 +12,13 @@ ### Variables: ### -MMBOARD_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\mmboard.pdb $(____DEBUGRUNTIME_2_p) \ +MMBOARD_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\mmboard.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - /I.\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /I.\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) \ + $(CXXFLAGS) MMBOARD_OBJECTS = \ $(OBJS)\mmboard_mmboard.obj \ $(OBJS)\mmboard_mmbman.obj \ diff --git a/contrib/samples/mmedia/makefile.wat b/contrib/samples/mmedia/makefile.wat index 4809f96..1b49cff 100644 --- a/contrib/samples/mmedia/makefile.wat +++ b/contrib/samples/mmedia/makefile.wat @@ -167,11 +167,11 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -MMBOARD_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include $(CXXFLAGS) & - $(__EXCEPTIONSFLAG_7) +MMBOARD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -i=.\..\..\include $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) & + $(CXXFLAGS) MMBOARD_OBJECTS = & $(OBJS)\mmboard_mmboard.obj & $(OBJS)\mmboard_mmbman.obj diff --git a/contrib/samples/ogl/ogledit/Makefile.in b/contrib/samples/ogl/ogledit/Makefile.in index b73c89c..6976901 100644 --- a/contrib/samples/ogl/ogledit/Makefile.in +++ b/contrib/samples/ogl/ogledit/Makefile.in @@ -36,10 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -OGLEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CPPFLAGS) \ - $(CXXFLAGS) +OGLEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ + -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS) OGLEDIT_OBJECTS = \ $(__ogledit_os2_lib_res) \ ogledit_ogledit.o \ @@ -81,10 +80,10 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \ - $(srcdir)/../../../include -o ogledit$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../../samples -i $(srcdir)/../../../include -o \ + ogledit$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \ + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -162,7 +161,7 @@ ogledit_ogledit.o: $(srcdir)/ogledit.cpp $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $< ogledit_ogledit_rc.o: $(srcdir)/ogledit.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(srcdir)/../../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(srcdir)/../../../include ogledit_palette.o: $(srcdir)/palette.cpp $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $< diff --git a/contrib/samples/ogl/ogledit/makefile.bcc b/contrib/samples/ogl/ogledit/makefile.bcc index 875776e..76764d7 100644 --- a/contrib/samples/ogl/ogledit/makefile.bcc +++ b/contrib/samples/ogl/ogledit/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,19 +19,15 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OGLEDIT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +OGLEDIT_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \ -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\..\samples \ - -I.\..\..\..\include $(CXXFLAGS) + -I.\..\..\..\include $(CPPFLAGS) $(CXXFLAGS) OGLEDIT_OBJECTS = \ $(OBJS)\ogledit_ogledit.obj \ $(OBJS)\ogledit_doc.obj \ @@ -183,6 +184,6 @@ clean: -if exist $(OBJS)\ogledit.ils del $(OBJS)\ogledit.ils $(OBJS)\ogledit.exe: $(OGLEDIT_OBJECTS) $(OBJS)\ogledit_ogledit.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(OGLEDIT_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\ogledit_ogledit.res | diff --git a/contrib/samples/ogl/ogledit/makefile.gcc b/contrib/samples/ogl/ogledit/makefile.gcc index 24e7195..76412f2 100644 --- a/contrib/samples/ogl/ogledit/makefile.gcc +++ b/contrib/samples/ogl/ogledit/makefile.gcc @@ -14,11 +14,11 @@ include ../../../../build/msw/config.gcc OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OGLEDIT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +OGLEDIT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) OGLEDIT_OBJECTS = \ $(OBJS)\ogledit_ogledit.o \ $(OBJS)\ogledit_doc.o \ diff --git a/contrib/samples/ogl/ogledit/makefile.vc b/contrib/samples/ogl/ogledit/makefile.vc index 36f9c39..27b94d0 100644 --- a/contrib/samples/ogl/ogledit/makefile.vc +++ b/contrib/samples/ogl/ogledit/makefile.vc @@ -14,13 +14,13 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OGLEDIT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\ogledit.pdb $(____DEBUGRUNTIME_2_p) \ +OGLEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\ogledit.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples \ - /I.\..\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) \ - $(__EXCEPTIONSFLAG_9) + /I.\..\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) \ + $(CPPFLAGS) $(CXXFLAGS) OGLEDIT_OBJECTS = \ $(OBJS)\ogledit_ogledit.obj \ $(OBJS)\ogledit_doc.obj \ diff --git a/contrib/samples/ogl/ogledit/makefile.wat b/contrib/samples/ogl/ogledit/makefile.wat index 8fc856f..625f06c 100644 --- a/contrib/samples/ogl/ogledit/makefile.wat +++ b/contrib/samples/ogl/ogledit/makefile.wat @@ -169,11 +169,11 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OGLEDIT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS) & - $(__EXCEPTIONSFLAG_7) +OGLEDIT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\..\samples -i=.\..\..\..\include $(__EXCEPTIONSFLAG_7) & + $(CPPFLAGS) $(CXXFLAGS) OGLEDIT_OBJECTS = & $(OBJS)\ogledit_ogledit.obj & $(OBJS)\ogledit_doc.obj & diff --git a/contrib/samples/ogl/studio/Makefile.in b/contrib/samples/ogl/studio/Makefile.in index 5508971..cfcc9cc 100644 --- a/contrib/samples/ogl/studio/Makefile.in +++ b/contrib/samples/ogl/studio/Makefile.in @@ -37,10 +37,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -STUDIO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CPPFLAGS) \ - $(CXXFLAGS) +STUDIO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ + -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS) STUDIO_OBJECTS = \ $(__studio_os2_lib_res) \ studio_studio.o \ @@ -88,10 +87,9 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \ - $(srcdir)/../../../include -o studio$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../../samples -i $(srcdir)/../../../include -o \ + studio$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX) @@ -201,7 +199,7 @@ studio_studio.o: $(srcdir)/studio.cpp $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $< studio_studio_rc.o: $(srcdir)/studio.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(srcdir)/../../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(srcdir)/../../../include studio_symbols.o: $(srcdir)/symbols.cpp $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $< diff --git a/contrib/samples/ogl/studio/makefile.bcc b/contrib/samples/ogl/studio/makefile.bcc index ea81039..8937ce4 100644 --- a/contrib/samples/ogl/studio/makefile.bcc +++ b/contrib/samples/ogl/studio/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,21 +19,17 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STUDIO_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +STUDIO_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \ -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\..\samples \ - -I.\..\..\..\include $(CXXFLAGS) + -I.\..\..\..\include $(CPPFLAGS) $(CXXFLAGS) STUDIO_OBJECTS = \ $(OBJS)\studio_studio.obj \ $(OBJS)\studio_doc.obj \ @@ -219,6 +220,6 @@ data: for %f in (studio_resources.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\studio.exe: $(STUDIO_OBJECTS) $(OBJS)\studio_studio.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(STUDIO_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\studio_studio.res | diff --git a/contrib/samples/ogl/studio/makefile.gcc b/contrib/samples/ogl/studio/makefile.gcc index 4935ccf..18f5c65 100644 --- a/contrib/samples/ogl/studio/makefile.gcc +++ b/contrib/samples/ogl/studio/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STUDIO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +STUDIO_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) STUDIO_OBJECTS = \ $(OBJS)\studio_studio.o \ $(OBJS)\studio_doc.o \ diff --git a/contrib/samples/ogl/studio/makefile.vc b/contrib/samples/ogl/studio/makefile.vc index 813589c..b6c8662 100644 --- a/contrib/samples/ogl/studio/makefile.vc +++ b/contrib/samples/ogl/studio/makefile.vc @@ -16,13 +16,13 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STUDIO_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +STUDIO_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\studio.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples \ - /I.\..\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) \ - $(__EXCEPTIONSFLAG_9) + /I.\..\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) \ + $(CPPFLAGS) $(CXXFLAGS) STUDIO_OBJECTS = \ $(OBJS)\studio_studio.obj \ $(OBJS)\studio_doc.obj \ diff --git a/contrib/samples/ogl/studio/makefile.wat b/contrib/samples/ogl/studio/makefile.wat index e9b0a57..c85616c 100644 --- a/contrib/samples/ogl/studio/makefile.wat +++ b/contrib/samples/ogl/studio/makefile.wat @@ -181,11 +181,11 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STUDIO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS) & - $(__EXCEPTIONSFLAG_7) +STUDIO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\..\samples -i=.\..\..\..\include $(__EXCEPTIONSFLAG_7) & + $(CPPFLAGS) $(CXXFLAGS) STUDIO_OBJECTS = & $(OBJS)\studio_studio.obj & $(OBJS)\studio_doc.obj & diff --git a/contrib/samples/plot/Makefile.in b/contrib/samples/plot/Makefile.in index c736240..69d22ec 100644 --- a/contrib/samples/plot/Makefile.in +++ b/contrib/samples/plot/Makefile.in @@ -36,10 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -PLOT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \ - $(CXXFLAGS) +PLOT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ + $(CPPFLAGS) $(CXXFLAGS) PLOT_OBJECTS = \ $(__plot_os2_lib_res) \ plot_plot.o \ @@ -78,9 +77,9 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \ - plot$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -i $(srcdir)/../../include -o plot$(EXEEXT) \ + Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -155,7 +154,7 @@ plot_plot.o: $(srcdir)/plot.cpp $(CXXC) -c -o $@ $(PLOT_CXXFLAGS) $< plot_plot_rc.o: $(srcdir)/plot.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include uninstall: diff --git a/contrib/samples/plot/makefile.bcc b/contrib/samples/plot/makefile.bcc index 959b4bf..0d42feb 100644 --- a/contrib/samples/plot/makefile.bcc +++ b/contrib/samples/plot/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,19 +19,15 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PLOT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +PLOT_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \ - $(CXXFLAGS) + $(CPPFLAGS) $(CXXFLAGS) PLOT_OBJECTS = \ $(OBJS)\plot_plot.obj SETUPHDIR = \ @@ -171,6 +172,6 @@ clean: -if exist $(OBJS)\plot.ils del $(OBJS)\plot.ils $(OBJS)\plot.exe: $(PLOT_OBJECTS) $(OBJS)\plot_plot.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(PLOT_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\plot_plot.res | diff --git a/contrib/samples/plot/makefile.gcc b/contrib/samples/plot/makefile.gcc index cf382c3..add133e 100644 --- a/contrib/samples/plot/makefile.gcc +++ b/contrib/samples/plot/makefile.gcc @@ -14,11 +14,11 @@ include ../../../build/msw/config.gcc OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PLOT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) +PLOT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) \ + -I.\..\..\..\samples -I.\..\..\include $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) PLOT_OBJECTS = \ $(OBJS)\plot_plot.o \ $(OBJS)\plot_plot_rc.o diff --git a/contrib/samples/plot/makefile.vc b/contrib/samples/plot/makefile.vc index 924fa87..8da725c 100644 --- a/contrib/samples/plot/makefile.vc +++ b/contrib/samples/plot/makefile.vc @@ -14,12 +14,13 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PLOT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +PLOT_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\plot.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - /I.\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /I.\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) \ + $(CXXFLAGS) PLOT_OBJECTS = \ $(OBJS)\plot_plot.obj \ $(OBJS)\plot_plot.res diff --git a/contrib/samples/plot/makefile.wat b/contrib/samples/plot/makefile.wat index 424d6e2..6e6cabe 100644 --- a/contrib/samples/plot/makefile.wat +++ b/contrib/samples/plot/makefile.wat @@ -169,11 +169,11 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PLOT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include $(CXXFLAGS) & - $(__EXCEPTIONSFLAG_7) +PLOT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -i=.\..\..\include $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) & + $(CXXFLAGS) PLOT_OBJECTS = & $(OBJS)\plot_plot.obj SETUPHDIR = & diff --git a/contrib/samples/stc/Makefile.in b/contrib/samples/stc/Makefile.in index ecd5b2e..202d744 100644 --- a/contrib/samples/stc/Makefile.in +++ b/contrib/samples/stc/Makefile.in @@ -36,10 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -STCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \ - $(CXXFLAGS) +STCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ + $(CPPFLAGS) $(CXXFLAGS) STCTEST_OBJECTS = \ $(__stctest___win32rc) \ $(__stctest_os2_lib_res) \ @@ -80,10 +79,9 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \ - stctest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \ - sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -i $(srcdir)/../../include -o stctest$(EXEEXT) \ + Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -169,7 +167,7 @@ stctest_prefs.o: $(srcdir)/prefs.cpp $(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $< stctest_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples stctest_stctest.o: $(srcdir)/stctest.cpp $(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $< diff --git a/contrib/samples/stc/makefile.bcc b/contrib/samples/stc/makefile.bcc index fedb0ad..37f1c33 100644 --- a/contrib/samples/stc/makefile.bcc +++ b/contrib/samples/stc/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,21 +19,17 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STCTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +STCTEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \ - $(CXXFLAGS) + $(CPPFLAGS) $(CXXFLAGS) STCTEST_OBJECTS = \ $(OBJS)\stctest_stctest.obj \ $(OBJS)\stctest_edit.obj \ @@ -183,6 +184,6 @@ data: for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\stctest.exe: $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(STCTEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\stctest_sample.res | diff --git a/contrib/samples/stc/makefile.gcc b/contrib/samples/stc/makefile.gcc index a34e4ad..2fb9452 100644 --- a/contrib/samples/stc/makefile.gcc +++ b/contrib/samples/stc/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STCTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +STCTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) STCTEST_OBJECTS = \ $(OBJS)\stctest_sample_rc.o \ $(OBJS)\stctest_stctest.o \ diff --git a/contrib/samples/stc/makefile.vc b/contrib/samples/stc/makefile.vc index 85d11d6..c03ca09 100644 --- a/contrib/samples/stc/makefile.vc +++ b/contrib/samples/stc/makefile.vc @@ -16,12 +16,13 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STCTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\stctest.pdb $(____DEBUGRUNTIME_2_p) \ +STCTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\stctest.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - /I.\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /I.\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) \ + $(CXXFLAGS) STCTEST_OBJECTS = \ $(OBJS)\stctest_sample.res \ $(OBJS)\stctest_stctest.obj \ diff --git a/contrib/samples/stc/makefile.wat b/contrib/samples/stc/makefile.wat index faa5b33..db148c9 100644 --- a/contrib/samples/stc/makefile.wat +++ b/contrib/samples/stc/makefile.wat @@ -171,11 +171,11 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STCTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include $(CXXFLAGS) & - $(__EXCEPTIONSFLAG_7) +STCTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -i=.\..\..\include $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) & + $(CXXFLAGS) STCTEST_OBJECTS = & $(OBJS)\stctest_stctest.obj & $(OBJS)\stctest_edit.obj & diff --git a/contrib/samples/svg/Makefile.in b/contrib/samples/svg/Makefile.in index 1cac1fd..b69d541 100644 --- a/contrib/samples/svg/Makefile.in +++ b/contrib/samples/svg/Makefile.in @@ -36,10 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -SVGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \ - $(CXXFLAGS) +SVGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ + $(CPPFLAGS) $(CXXFLAGS) SVGTEST_OBJECTS = \ $(__svgtest___win32rc) \ $(__svgtest_os2_lib_res) \ @@ -78,10 +77,9 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \ - svgtest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \ - sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -i $(srcdir)/../../include -o svgtest$(EXEEXT) \ + Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -153,7 +151,7 @@ svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. @COND_PLATFORM_MACOSX_1@svgtest_bundle: svgtest.app/Contents/PkgInfo svgtest_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples svgtest_svgtest.o: $(srcdir)/svgtest.cpp $(CXXC) -c -o $@ $(SVGTEST_CXXFLAGS) $< diff --git a/contrib/samples/svg/makefile.bcc b/contrib/samples/svg/makefile.bcc index e6be13a..c9cc4ff 100644 --- a/contrib/samples/svg/makefile.bcc +++ b/contrib/samples/svg/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,21 +19,17 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +SVGTEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \ - $(CXXFLAGS) + $(CPPFLAGS) $(CXXFLAGS) SVGTEST_OBJECTS = \ $(OBJS)\svgtest_svgtest.obj @@ -171,6 +172,6 @@ clean: -if exist $(OBJS)\svgtest.ils del $(OBJS)\svgtest.ils $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(SVGTEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\svgtest_sample.res | diff --git a/contrib/samples/svg/makefile.gcc b/contrib/samples/svg/makefile.gcc index 82721b2..5b90400 100644 --- a/contrib/samples/svg/makefile.gcc +++ b/contrib/samples/svg/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +SVGTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) SVGTEST_OBJECTS = \ $(OBJS)\svgtest_sample_rc.o \ $(OBJS)\svgtest_svgtest.o diff --git a/contrib/samples/svg/makefile.vc b/contrib/samples/svg/makefile.vc index a5ebdab..ed8b838 100644 --- a/contrib/samples/svg/makefile.vc +++ b/contrib/samples/svg/makefile.vc @@ -16,12 +16,13 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SVGTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\svgtest.pdb $(____DEBUGRUNTIME_2_p) \ +SVGTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\svgtest.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - /I.\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /I.\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) \ + $(CXXFLAGS) SVGTEST_OBJECTS = \ $(OBJS)\svgtest_sample.res \ $(OBJS)\svgtest_svgtest.obj diff --git a/contrib/samples/svg/makefile.wat b/contrib/samples/svg/makefile.wat index 7a7526b..895ce25 100644 --- a/contrib/samples/svg/makefile.wat +++ b/contrib/samples/svg/makefile.wat @@ -171,11 +171,11 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include $(CXXFLAGS) & - $(__EXCEPTIONSFLAG_7) +SVGTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -i=.\..\..\include $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) & + $(CXXFLAGS) SVGTEST_OBJECTS = & $(OBJS)\svgtest_svgtest.obj diff --git a/contrib/samples/xrc/Makefile.in b/contrib/samples/xrc/Makefile.in index 2c70c4b..112a388 100644 --- a/contrib/samples/xrc/Makefile.in +++ b/contrib/samples/xrc/Makefile.in @@ -39,10 +39,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib WX_VERSION = 2.5.1 -XRCDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \ - $(CXXFLAGS) +XRCDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ + $(CPPFLAGS) $(CXXFLAGS) XRCDEMO_OBJECTS = \ $(__xrcdemo_os2_lib_res) \ xrcdemo_xrcdemo.o \ @@ -83,10 +82,9 @@ XRCDEMO_OBJECTS = \ @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \ - xrcdemo$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \ - sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -i $(srcdir)/../../include -o xrcdemo$(EXEEXT) \ + Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX) @@ -188,7 +186,7 @@ xrcdemo_xrcdemo.o: $(srcdir)/xrcdemo.cpp $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $< xrcdemo_xrcdemo_rc.o: $(srcdir)/xrcdemo.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include # Include dependency info, if present: diff --git a/contrib/samples/xrc/makefile.bcc b/contrib/samples/xrc/makefile.bcc index f71d351..47bc7a6 100644 --- a/contrib/samples/xrc/makefile.bcc +++ b/contrib/samples/xrc/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,21 +19,17 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +XRCDEMO_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \ - $(CXXFLAGS) + $(CPPFLAGS) $(CXXFLAGS) XRCDEMO_OBJECTS = \ $(OBJS)\xrcdemo_xrcdemo.obj \ $(OBJS)\xrcdemo_myframe.obj \ @@ -198,6 +199,6 @@ data: for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(XRCDEMO_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\xrcdemo_xrcdemo.res | diff --git a/contrib/samples/xrc/makefile.gcc b/contrib/samples/xrc/makefile.gcc index c4696dd..3017fae 100644 --- a/contrib/samples/xrc/makefile.gcc +++ b/contrib/samples/xrc/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +XRCDEMO_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) XRCDEMO_OBJECTS = \ $(OBJS)\xrcdemo_xrcdemo.o \ $(OBJS)\xrcdemo_myframe.o \ diff --git a/contrib/samples/xrc/makefile.vc b/contrib/samples/xrc/makefile.vc index da291e7..fd23291 100644 --- a/contrib/samples/xrc/makefile.vc +++ b/contrib/samples/xrc/makefile.vc @@ -16,12 +16,13 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -XRCDEMO_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\xrcdemo.pdb $(____DEBUGRUNTIME_2_p) \ +XRCDEMO_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\xrcdemo.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - /I.\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /I.\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) \ + $(CXXFLAGS) XRCDEMO_OBJECTS = \ $(OBJS)\xrcdemo_xrcdemo.obj \ $(OBJS)\xrcdemo_myframe.obj \ diff --git a/contrib/samples/xrc/makefile.wat b/contrib/samples/xrc/makefile.wat index ecf88fd..970f969 100644 --- a/contrib/samples/xrc/makefile.wat +++ b/contrib/samples/xrc/makefile.wat @@ -185,11 +185,11 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include $(CXXFLAGS) & - $(__EXCEPTIONSFLAG_7) +XRCDEMO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -i=.\..\..\include $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) & + $(CXXFLAGS) XRCDEMO_OBJECTS = & $(OBJS)\xrcdemo_xrcdemo.obj & $(OBJS)\xrcdemo_myframe.obj & diff --git a/contrib/src/animate/Makefile.in b/contrib/src/animate/Makefile.in index 048f195..117cd50 100644 --- a/contrib/src/animate/Makefile.in +++ b/contrib/src/animate/Makefile.in @@ -43,15 +43,16 @@ top_srcdir = @top_srcdir@ ### Variables: ### ANIMATEDLL_CXXFLAGS = $(__animatedll_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -DWXUSINGDLL -DWXMAKINGDLL_ANIMATE $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \ + -DWXMAKINGDLL_ANIMATE $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) ANIMATEDLL_OBJECTS = \ animatedll_animate.o +ANIMATEDLL_ODEP = $(___pch_wxprec_animatedll_wx_wxprec_h_gch___depname) ANIMATELIB_CXXFLAGS = $(__animatelib_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - $(CPPFLAGS) $(CXXFLAGS) + $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS) ANIMATELIB_OBJECTS = \ animatelib_animate.o +ANIMATELIB_ODEP = $(___pch_wxprec_animatelib_wx_wxprec_h_gch___depname) DESTDIR = LIBDIRNAME = $(top_builddir)lib WX_VERSION = 2.5.1 @@ -102,8 +103,10 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_GCC_PCH_1@__animatedll_PCH_DEP = \ -@COND_GCC_PCH_1@ .pch/wxprec_animatedll/wx/wxprec.h.gch +@COND_GCC_PCH_1@___pch_wxprec_animatedll_wx_wxprec_h_gch___depname \ +@COND_GCC_PCH_1@ = .pch/wxprec_animatedll/wx/wxprec.h.gch +@COND_GCC_PCH_1@___pch_wxprec_animatelib_wx_wxprec_h_gch___depname \ +@COND_GCC_PCH_1@ = .pch/wxprec_animatelib/wx/wxprec.h.gch @COND_GCC_PCH_1@__animatedll_PCH_INC = -I.pch/wxprec_animatedll COND_SHARED_1___animatedll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) @@ -154,8 +157,6 @@ COND_USE_SOVERSOLARIS_1___animatedll___soname_flags = \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__animatedll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .1.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__animatedll___targetsuf3 = .$(SO_SUFFIX) -@COND_GCC_PCH_1@__animatelib_PCH_DEP = \ -@COND_GCC_PCH_1@ .pch/wxprec_animatelib/wx/wxprec.h.gch @COND_GCC_PCH_1@__animatelib_PCH_INC = -I.pch/wxprec_animatelib COND_SHARED_0___animatelib___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).a @@ -173,20 +174,20 @@ all: $(__animatedll___depname) $(__animatelib___depname) @COND_GCC_PCH_1@.pch/wxprec_animatelib/wx/wxprec.h.gch: @COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_animatelib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ANIMATELIB_CXXFLAGS) -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3): $(__animatedll_PCH_DEP) $(ANIMATEDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3): $(ANIMATEDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(ANIMATEDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__animatedll___macinstnamecmd) $(__animatedll___importlib) $(__animatedll___soname_flags) $(__animatedll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ @COND_SHARED_1@ $(__animatedll___so_symlinks_cmd) -animatedll_animate.o: $(srcdir)/animate.cpp +animatedll_animate.o: $(srcdir)/animate.cpp $(ANIMATEDLL_ODEP) $(CXXC) -c -o $@ $(ANIMATEDLL_CXXFLAGS) $< -@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).a: $(__animatelib_PCH_DEP) $(ANIMATELIB_OBJECTS) +@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).a: $(ANIMATELIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ $(ANIMATELIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ -animatelib_animate.o: $(srcdir)/animate.cpp +animatelib_animate.o: $(srcdir)/animate.cpp $(ANIMATELIB_ODEP) $(CXXC) -c -o $@ $(ANIMATELIB_CXXFLAGS) $< clean: diff --git a/contrib/src/deprecated/Makefile.in b/contrib/src/deprecated/Makefile.in index 611e7c4..c94cfa9 100644 --- a/contrib/src/deprecated/Makefile.in +++ b/contrib/src/deprecated/Makefile.in @@ -45,13 +45,11 @@ top_srcdir = @top_srcdir@ ### Variables: ### DEPRECATEDDLL_CFLAGS = $(__deprecateddll_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED -I$(srcdir) $(PIC_FLAG) $(CPPFLAGS) \ - $(CFLAGS) + $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \ + -DWXMAKINGDLL_DEPRECATED -I$(srcdir) $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS) DEPRECATEDDLL_CXXFLAGS = $(__deprecateddll_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED -I$(srcdir) $(PIC_FLAG) $(CPPFLAGS) \ - $(CXXFLAGS) + $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \ + -DWXMAKINGDLL_DEPRECATED -I$(srcdir) $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) DEPRECATEDDLL_OBJECTS = \ deprecateddll_prop.o \ deprecateddll_propform.o \ @@ -61,12 +59,14 @@ DEPRECATEDDLL_OBJECTS = \ deprecateddll_treelay.o \ deprecateddll_wxexpr.o \ deprecateddll_dosyacc.o +DEPRECATEDDLL_ODEP = \ + $(___pch_wxprec_deprecateddll_wx_wxprec_h_gch___depname) DEPRECATEDLIB_CFLAGS = $(__deprecatedlib_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -I$(srcdir) $(CPPFLAGS) $(CFLAGS) + $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CPPFLAGS) \ + $(CFLAGS) DEPRECATEDLIB_CXXFLAGS = $(__deprecatedlib_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -I$(srcdir) $(CPPFLAGS) $(CXXFLAGS) + $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CPPFLAGS) \ + $(CXXFLAGS) DEPRECATEDLIB_OBJECTS = \ deprecatedlib_prop.o \ deprecatedlib_propform.o \ @@ -76,6 +76,8 @@ DEPRECATEDLIB_OBJECTS = \ deprecatedlib_treelay.o \ deprecatedlib_wxexpr.o \ deprecatedlib_dosyacc.o +DEPRECATEDLIB_ODEP = \ + $(___pch_wxprec_deprecatedlib_wx_wxprec_h_gch___depname) DESTDIR = LIBDIRNAME = $(top_builddir)lib WX_VERSION = 2.5.1 @@ -128,8 +130,10 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_GCC_PCH_1@__deprecateddll_PCH_DEP = \ -@COND_GCC_PCH_1@ .pch/wxprec_deprecateddll/wx/wxprec.h.gch +@COND_GCC_PCH_1@___pch_wxprec_deprecateddll_wx_wxprec_h_gch___depname \ +@COND_GCC_PCH_1@ = .pch/wxprec_deprecateddll/wx/wxprec.h.gch +@COND_GCC_PCH_1@___pch_wxprec_deprecatedlib_wx_wxprec_h_gch___depname \ +@COND_GCC_PCH_1@ = .pch/wxprec_deprecatedlib/wx/wxprec.h.gch @COND_GCC_PCH_1@__deprecateddll_PCH_INC = -I.pch/wxprec_deprecateddll COND_SHARED_1___deprecateddll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) @@ -180,8 +184,6 @@ COND_USE_SOVERSOLARIS_1___deprecateddll___soname_flags = \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__deprecateddll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .1.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__deprecateddll___targetsuf3 = .$(SO_SUFFIX) -@COND_GCC_PCH_1@__deprecatedlib_PCH_DEP = \ -@COND_GCC_PCH_1@ .pch/wxprec_deprecatedlib/wx/wxprec.h.gch @COND_GCC_PCH_1@__deprecatedlib_PCH_INC = -I.pch/wxprec_deprecatedlib COND_SHARED_0___deprecatedlib___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).a @@ -207,62 +209,62 @@ clean: rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).a -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3): $(__deprecateddll_PCH_DEP) $(DEPRECATEDDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3): $(DEPRECATEDDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__deprecateddll___macinstnamecmd) $(__deprecateddll___importlib) $(__deprecateddll___soname_flags) $(__deprecateddll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ @COND_SHARED_1@ $(__deprecateddll___so_symlinks_cmd) -deprecateddll_dosyacc.o: $(srcdir)/dosyacc.c +deprecateddll_dosyacc.o: $(srcdir)/dosyacc.c $(DEPRECATEDDLL_ODEP) $(CCC) -c -o $@ $(DEPRECATEDDLL_CFLAGS) $< -deprecateddll_prop.o: $(srcdir)/prop.cpp +deprecateddll_prop.o: $(srcdir)/prop.cpp $(DEPRECATEDDLL_ODEP) $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< -deprecateddll_propform.o: $(srcdir)/propform.cpp +deprecateddll_propform.o: $(srcdir)/propform.cpp $(DEPRECATEDDLL_ODEP) $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< -deprecateddll_proplist.o: $(srcdir)/proplist.cpp +deprecateddll_proplist.o: $(srcdir)/proplist.cpp $(DEPRECATEDDLL_ODEP) $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< -deprecateddll_resource.o: $(srcdir)/resource.cpp +deprecateddll_resource.o: $(srcdir)/resource.cpp $(DEPRECATEDDLL_ODEP) $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< -deprecateddll_tbarsmpl.o: $(srcdir)/tbarsmpl.cpp +deprecateddll_tbarsmpl.o: $(srcdir)/tbarsmpl.cpp $(DEPRECATEDDLL_ODEP) $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< -deprecateddll_treelay.o: $(srcdir)/treelay.cpp +deprecateddll_treelay.o: $(srcdir)/treelay.cpp $(DEPRECATEDDLL_ODEP) $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< -deprecateddll_wxexpr.o: $(srcdir)/wxexpr.cpp +deprecateddll_wxexpr.o: $(srcdir)/wxexpr.cpp $(DEPRECATEDDLL_ODEP) $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< -@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).a: $(__deprecatedlib_PCH_DEP) $(DEPRECATEDLIB_OBJECTS) +@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).a: $(DEPRECATEDLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ $(DEPRECATEDLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ -deprecatedlib_dosyacc.o: $(srcdir)/dosyacc.c +deprecatedlib_dosyacc.o: $(srcdir)/dosyacc.c $(DEPRECATEDLIB_ODEP) $(CCC) -c -o $@ $(DEPRECATEDLIB_CFLAGS) $< -deprecatedlib_prop.o: $(srcdir)/prop.cpp +deprecatedlib_prop.o: $(srcdir)/prop.cpp $(DEPRECATEDLIB_ODEP) $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< -deprecatedlib_propform.o: $(srcdir)/propform.cpp +deprecatedlib_propform.o: $(srcdir)/propform.cpp $(DEPRECATEDLIB_ODEP) $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< -deprecatedlib_proplist.o: $(srcdir)/proplist.cpp +deprecatedlib_proplist.o: $(srcdir)/proplist.cpp $(DEPRECATEDLIB_ODEP) $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< -deprecatedlib_resource.o: $(srcdir)/resource.cpp +deprecatedlib_resource.o: $(srcdir)/resource.cpp $(DEPRECATEDLIB_ODEP) $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< -deprecatedlib_tbarsmpl.o: $(srcdir)/tbarsmpl.cpp +deprecatedlib_tbarsmpl.o: $(srcdir)/tbarsmpl.cpp $(DEPRECATEDLIB_ODEP) $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< -deprecatedlib_treelay.o: $(srcdir)/treelay.cpp +deprecatedlib_treelay.o: $(srcdir)/treelay.cpp $(DEPRECATEDLIB_ODEP) $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< -deprecatedlib_wxexpr.o: $(srcdir)/wxexpr.cpp +deprecatedlib_wxexpr.o: $(srcdir)/wxexpr.cpp $(DEPRECATEDLIB_ODEP) $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< distclean: clean diff --git a/contrib/src/fl/Makefile.in b/contrib/src/fl/Makefile.in index 5a346df..4b43c6f 100644 --- a/contrib/src/fl/Makefile.in +++ b/contrib/src/fl/Makefile.in @@ -44,8 +44,8 @@ top_srcdir = @top_srcdir@ DESTDIR = FLDLL_CXXFLAGS = $(__fldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir)/../../include -DWXUSINGDLL \ - -DWXMAKINGDLL_FL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_FL $(PIC_FLAG) \ + $(CPPFLAGS) $(CXXFLAGS) FLDLL_OBJECTS = \ fldll_antiflickpl.o \ fldll_bardragpl.o \ @@ -64,8 +64,9 @@ FLDLL_OBJECTS = \ fldll_rowlayoutpl.o \ fldll_toolwnd.o \ fldll_updatesmgr.o +FLDLL_ODEP = $(___pch_wxprec_fldll_wx_wxprec_h_gch___depname) FLLIB_CXXFLAGS = $(__fllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS) + -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS) FLLIB_OBJECTS = \ fllib_antiflickpl.o \ fllib_bardragpl.o \ @@ -84,6 +85,7 @@ FLLIB_OBJECTS = \ fllib_rowlayoutpl.o \ fllib_toolwnd.o \ fllib_updatesmgr.o +FLLIB_ODEP = $(___pch_wxprec_fllib_wx_wxprec_h_gch___depname) LIBDIRNAME = $(top_builddir)lib WX_VERSION = 2.5.1 @@ -133,7 +135,10 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_GCC_PCH_1@__fldll_PCH_DEP = .pch/wxprec_fldll/wx/wxprec.h.gch +@COND_GCC_PCH_1@___pch_wxprec_fldll_wx_wxprec_h_gch___depname \ +@COND_GCC_PCH_1@ = .pch/wxprec_fldll/wx/wxprec.h.gch +@COND_GCC_PCH_1@___pch_wxprec_fllib_wx_wxprec_h_gch___depname \ +@COND_GCC_PCH_1@ = .pch/wxprec_fllib/wx/wxprec.h.gch @COND_GCC_PCH_1@__fldll_PCH_INC = -I.pch/wxprec_fldll COND_SHARED_1___fldll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) @@ -183,7 +188,6 @@ COND_USE_SOVERSOLARIS_1___fldll___soname_flags = \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__fldll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .1.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__fldll___targetsuf3 = .$(SO_SUFFIX) -@COND_GCC_PCH_1@__fllib_PCH_DEP = .pch/wxprec_fllib/wx/wxprec.h.gch @COND_GCC_PCH_1@__fllib_PCH_INC = -I.pch/wxprec_fllib COND_SHARED_0___fllib___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).a @@ -212,116 +216,116 @@ clean: distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3): $(__fldll_PCH_DEP) $(FLDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3): $(FLDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(FLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__fldll___macinstnamecmd) $(__fldll___importlib) $(__fldll___soname_flags) $(__fldll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ @COND_SHARED_1@ $(__fldll___so_symlinks_cmd) -fldll_antiflickpl.o: $(srcdir)/antiflickpl.cpp +fldll_antiflickpl.o: $(srcdir)/antiflickpl.cpp $(FLDLL_ODEP) $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< -fldll_bardragpl.o: $(srcdir)/bardragpl.cpp +fldll_bardragpl.o: $(srcdir)/bardragpl.cpp $(FLDLL_ODEP) $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< -fldll_barhintspl.o: $(srcdir)/barhintspl.cpp +fldll_barhintspl.o: $(srcdir)/barhintspl.cpp $(FLDLL_ODEP) $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< -fldll_cbcustom.o: $(srcdir)/cbcustom.cpp +fldll_cbcustom.o: $(srcdir)/cbcustom.cpp $(FLDLL_ODEP) $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< -fldll_controlbar.o: $(srcdir)/controlbar.cpp +fldll_controlbar.o: $(srcdir)/controlbar.cpp $(FLDLL_ODEP) $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< -fldll_dyntbar.o: $(srcdir)/dyntbar.cpp +fldll_dyntbar.o: $(srcdir)/dyntbar.cpp $(FLDLL_ODEP) $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< -fldll_dyntbarhnd.o: $(srcdir)/dyntbarhnd.cpp +fldll_dyntbarhnd.o: $(srcdir)/dyntbarhnd.cpp $(FLDLL_ODEP) $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< -fldll_frmview.o: $(srcdir)/frmview.cpp +fldll_frmview.o: $(srcdir)/frmview.cpp $(FLDLL_ODEP) $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< -fldll_garbagec.o: $(srcdir)/garbagec.cpp +fldll_garbagec.o: $(srcdir)/garbagec.cpp $(FLDLL_ODEP) $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< -fldll_gcupdatesmgr.o: $(srcdir)/gcupdatesmgr.cpp +fldll_gcupdatesmgr.o: $(srcdir)/gcupdatesmgr.cpp $(FLDLL_ODEP) $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< -fldll_hintanimpl.o: $(srcdir)/hintanimpl.cpp +fldll_hintanimpl.o: $(srcdir)/hintanimpl.cpp $(FLDLL_ODEP) $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< -fldll_newbmpbtn.o: $(srcdir)/newbmpbtn.cpp +fldll_newbmpbtn.o: $(srcdir)/newbmpbtn.cpp $(FLDLL_ODEP) $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< -fldll_panedrawpl.o: $(srcdir)/panedrawpl.cpp +fldll_panedrawpl.o: $(srcdir)/panedrawpl.cpp $(FLDLL_ODEP) $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< -fldll_rowdragpl.o: $(srcdir)/rowdragpl.cpp +fldll_rowdragpl.o: $(srcdir)/rowdragpl.cpp $(FLDLL_ODEP) $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< -fldll_rowlayoutpl.o: $(srcdir)/rowlayoutpl.cpp +fldll_rowlayoutpl.o: $(srcdir)/rowlayoutpl.cpp $(FLDLL_ODEP) $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< -fldll_toolwnd.o: $(srcdir)/toolwnd.cpp +fldll_toolwnd.o: $(srcdir)/toolwnd.cpp $(FLDLL_ODEP) $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< -fldll_updatesmgr.o: $(srcdir)/updatesmgr.cpp +fldll_updatesmgr.o: $(srcdir)/updatesmgr.cpp $(FLDLL_ODEP) $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< -@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).a: $(__fllib_PCH_DEP) $(FLLIB_OBJECTS) +@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).a: $(FLLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ $(FLLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ -fllib_antiflickpl.o: $(srcdir)/antiflickpl.cpp +fllib_antiflickpl.o: $(srcdir)/antiflickpl.cpp $(FLLIB_ODEP) $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< -fllib_bardragpl.o: $(srcdir)/bardragpl.cpp +fllib_bardragpl.o: $(srcdir)/bardragpl.cpp $(FLLIB_ODEP) $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< -fllib_barhintspl.o: $(srcdir)/barhintspl.cpp +fllib_barhintspl.o: $(srcdir)/barhintspl.cpp $(FLLIB_ODEP) $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< -fllib_cbcustom.o: $(srcdir)/cbcustom.cpp +fllib_cbcustom.o: $(srcdir)/cbcustom.cpp $(FLLIB_ODEP) $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< -fllib_controlbar.o: $(srcdir)/controlbar.cpp +fllib_controlbar.o: $(srcdir)/controlbar.cpp $(FLLIB_ODEP) $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< -fllib_dyntbar.o: $(srcdir)/dyntbar.cpp +fllib_dyntbar.o: $(srcdir)/dyntbar.cpp $(FLLIB_ODEP) $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< -fllib_dyntbarhnd.o: $(srcdir)/dyntbarhnd.cpp +fllib_dyntbarhnd.o: $(srcdir)/dyntbarhnd.cpp $(FLLIB_ODEP) $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< -fllib_frmview.o: $(srcdir)/frmview.cpp +fllib_frmview.o: $(srcdir)/frmview.cpp $(FLLIB_ODEP) $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< -fllib_garbagec.o: $(srcdir)/garbagec.cpp +fllib_garbagec.o: $(srcdir)/garbagec.cpp $(FLLIB_ODEP) $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< -fllib_gcupdatesmgr.o: $(srcdir)/gcupdatesmgr.cpp +fllib_gcupdatesmgr.o: $(srcdir)/gcupdatesmgr.cpp $(FLLIB_ODEP) $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< -fllib_hintanimpl.o: $(srcdir)/hintanimpl.cpp +fllib_hintanimpl.o: $(srcdir)/hintanimpl.cpp $(FLLIB_ODEP) $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< -fllib_newbmpbtn.o: $(srcdir)/newbmpbtn.cpp +fllib_newbmpbtn.o: $(srcdir)/newbmpbtn.cpp $(FLLIB_ODEP) $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< -fllib_panedrawpl.o: $(srcdir)/panedrawpl.cpp +fllib_panedrawpl.o: $(srcdir)/panedrawpl.cpp $(FLLIB_ODEP) $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< -fllib_rowdragpl.o: $(srcdir)/rowdragpl.cpp +fllib_rowdragpl.o: $(srcdir)/rowdragpl.cpp $(FLLIB_ODEP) $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< -fllib_rowlayoutpl.o: $(srcdir)/rowlayoutpl.cpp +fllib_rowlayoutpl.o: $(srcdir)/rowlayoutpl.cpp $(FLLIB_ODEP) $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< -fllib_toolwnd.o: $(srcdir)/toolwnd.cpp +fllib_toolwnd.o: $(srcdir)/toolwnd.cpp $(FLLIB_ODEP) $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< -fllib_updatesmgr.o: $(srcdir)/updatesmgr.cpp +fllib_updatesmgr.o: $(srcdir)/updatesmgr.cpp $(FLLIB_ODEP) $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $< install: all $(__install_fldll___depname) $(__install_fllib___depname) diff --git a/contrib/src/gizmos/Makefile.in b/contrib/src/gizmos/Makefile.in index 4b8460f..ffbaf2b 100644 --- a/contrib/src/gizmos/Makefile.in +++ b/contrib/src/gizmos/Makefile.in @@ -44,8 +44,8 @@ top_srcdir = @top_srcdir@ DESTDIR = GIZMOSDLL_CXXFLAGS = $(__gizmosdll_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \ + -DWXMAKINGDLL_GIZMOS $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) GIZMOSDLL_OBJECTS = \ gizmosdll_dynamicsash.o \ gizmosdll_editlbox.o \ @@ -53,9 +53,9 @@ GIZMOSDLL_OBJECTS = \ gizmosdll_multicell.o \ gizmosdll_splittree.o \ gizmosdll_statpict.o +GIZMOSDLL_ODEP = $(___pch_wxprec_gizmosdll_wx_wxprec_h_gch___depname) GIZMOSLIB_CXXFLAGS = $(__gizmoslib_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - $(CPPFLAGS) $(CXXFLAGS) + $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS) GIZMOSLIB_OBJECTS = \ gizmoslib_dynamicsash.o \ gizmoslib_editlbox.o \ @@ -63,6 +63,7 @@ GIZMOSLIB_OBJECTS = \ gizmoslib_multicell.o \ gizmoslib_splittree.o \ gizmoslib_statpict.o +GIZMOSLIB_ODEP = $(___pch_wxprec_gizmoslib_wx_wxprec_h_gch___depname) LIBDIRNAME = $(top_builddir)lib WX_VERSION = 2.5.1 @@ -112,7 +113,10 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_GCC_PCH_1@__gizmosdll_PCH_DEP = .pch/wxprec_gizmosdll/wx/wxprec.h.gch +@COND_GCC_PCH_1@___pch_wxprec_gizmosdll_wx_wxprec_h_gch___depname \ +@COND_GCC_PCH_1@ = .pch/wxprec_gizmosdll/wx/wxprec.h.gch +@COND_GCC_PCH_1@___pch_wxprec_gizmoslib_wx_wxprec_h_gch___depname \ +@COND_GCC_PCH_1@ = .pch/wxprec_gizmoslib/wx/wxprec.h.gch @COND_GCC_PCH_1@__gizmosdll_PCH_INC = -I.pch/wxprec_gizmosdll COND_SHARED_1___gizmosdll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) @@ -162,7 +166,6 @@ COND_USE_SOVERSOLARIS_1___gizmosdll___soname_flags = \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmosdll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .1.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__gizmosdll___targetsuf3 = .$(SO_SUFFIX) -@COND_GCC_PCH_1@__gizmoslib_PCH_DEP = .pch/wxprec_gizmoslib/wx/wxprec.h.gch @COND_GCC_PCH_1@__gizmoslib_PCH_INC = -I.pch/wxprec_gizmoslib COND_SHARED_0___gizmoslib___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a @@ -191,50 +194,50 @@ clean: distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3): $(__gizmosdll_PCH_DEP) $(GIZMOSDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3): $(GIZMOSDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__gizmosdll___macinstnamecmd) $(__gizmosdll___importlib) $(__gizmosdll___soname_flags) $(__gizmosdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_BASE_p) $(__WXLIB_CORE_p) @COND_SHARED_1@ @COND_SHARED_1@ $(__gizmosdll___so_symlinks_cmd) -gizmosdll_dynamicsash.o: $(srcdir)/dynamicsash.cpp +gizmosdll_dynamicsash.o: $(srcdir)/dynamicsash.cpp $(GIZMOSDLL_ODEP) $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< -gizmosdll_editlbox.o: $(srcdir)/editlbox.cpp +gizmosdll_editlbox.o: $(srcdir)/editlbox.cpp $(GIZMOSDLL_ODEP) $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< -gizmosdll_ledctrl.o: $(srcdir)/ledctrl.cpp +gizmosdll_ledctrl.o: $(srcdir)/ledctrl.cpp $(GIZMOSDLL_ODEP) $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< -gizmosdll_multicell.o: $(srcdir)/multicell.cpp +gizmosdll_multicell.o: $(srcdir)/multicell.cpp $(GIZMOSDLL_ODEP) $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< -gizmosdll_splittree.o: $(srcdir)/splittree.cpp +gizmosdll_splittree.o: $(srcdir)/splittree.cpp $(GIZMOSDLL_ODEP) $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< -gizmosdll_statpict.o: $(srcdir)/statpict.cpp +gizmosdll_statpict.o: $(srcdir)/statpict.cpp $(GIZMOSDLL_ODEP) $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< -@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a: $(__gizmoslib_PCH_DEP) $(GIZMOSLIB_OBJECTS) +@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a: $(GIZMOSLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ $(GIZMOSLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ -gizmoslib_dynamicsash.o: $(srcdir)/dynamicsash.cpp +gizmoslib_dynamicsash.o: $(srcdir)/dynamicsash.cpp $(GIZMOSLIB_ODEP) $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< -gizmoslib_editlbox.o: $(srcdir)/editlbox.cpp +gizmoslib_editlbox.o: $(srcdir)/editlbox.cpp $(GIZMOSLIB_ODEP) $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< -gizmoslib_ledctrl.o: $(srcdir)/ledctrl.cpp +gizmoslib_ledctrl.o: $(srcdir)/ledctrl.cpp $(GIZMOSLIB_ODEP) $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< -gizmoslib_multicell.o: $(srcdir)/multicell.cpp +gizmoslib_multicell.o: $(srcdir)/multicell.cpp $(GIZMOSLIB_ODEP) $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< -gizmoslib_splittree.o: $(srcdir)/splittree.cpp +gizmoslib_splittree.o: $(srcdir)/splittree.cpp $(GIZMOSLIB_ODEP) $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< -gizmoslib_statpict.o: $(srcdir)/statpict.cpp +gizmoslib_statpict.o: $(srcdir)/statpict.cpp $(GIZMOSLIB_ODEP) $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< install: all $(__install_gizmosdll___depname) $(__install_gizmoslib___depname) diff --git a/contrib/src/mmedia/Makefile.in b/contrib/src/mmedia/Makefile.in index 8b4a1d3..4a595df 100644 --- a/contrib/src/mmedia/Makefile.in +++ b/contrib/src/mmedia/Makefile.in @@ -46,8 +46,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib MMEDIADLL_CXXFLAGS = $(__mmediadll_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -DWXUSINGDLL -DWXMAKINGDLL_MMEDIA $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \ + -DWXMAKINGDLL_MMEDIA $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) MMEDIADLL_OBJECTS = \ $(__MMEDIA_PLATFORM_SRC_OBJECTS) \ mmediadll_cdbase.o \ @@ -67,9 +67,9 @@ MMEDIADLL_OBJECTS = \ mmediadll_sndulaw.o \ mmediadll_sndwav.o \ mmediadll_vidbase.o +MMEDIADLL_ODEP = $(___pch_wxprec_mmediadll_wx_wxprec_h_gch___depname) MMEDIALIB_CXXFLAGS = $(__mmedialib_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - $(CPPFLAGS) $(CXXFLAGS) + $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS) MMEDIALIB_OBJECTS = \ $(__MMEDIA_PLATFORM_SRC_OBJECTS_1) \ mmedialib_cdbase.o \ @@ -89,6 +89,7 @@ MMEDIALIB_OBJECTS = \ mmedialib_sndulaw.o \ mmedialib_sndwav.o \ mmedialib_vidbase.o +MMEDIALIB_ODEP = $(___pch_wxprec_mmedialib_wx_wxprec_h_gch___depname) WX_VERSION = 2.5.1 ### Conditionally set variables: ### @@ -155,9 +156,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_GCC_PCH_1@___pch_wxprec_mmediadll_wx_wxprec_h_gch___depname \ +@COND_GCC_PCH_1@ = .pch/wxprec_mmediadll/wx/wxprec.h.gch +@COND_GCC_PCH_1@___pch_wxprec_mmedialib_wx_wxprec_h_gch___depname \ +@COND_GCC_PCH_1@ = .pch/wxprec_mmedialib/wx/wxprec.h.gch @COND_SHARED_1@__install_mmediadll___depname = install_mmediadll @COND_SHARED_0@__install_mmedialib___depname = install_mmedialib -@COND_GCC_PCH_1@__mmediadll_PCH_DEP = .pch/wxprec_mmediadll/wx/wxprec.h.gch @COND_GCC_PCH_1@__mmediadll_PCH_INC = -I.pch/wxprec_mmediadll COND_SHARED_1___mmediadll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) @@ -207,7 +211,6 @@ COND_USE_SOVERSOLARIS_1___mmediadll___soname_flags = \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__mmediadll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .1.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__mmediadll___targetsuf3 = .$(SO_SUFFIX) -@COND_GCC_PCH_1@__mmedialib_PCH_DEP = .pch/wxprec_mmedialib/wx/wxprec.h.gch @COND_GCC_PCH_1@__mmedialib_PCH_INC = -I.pch/wxprec_mmedialib COND_SHARED_0___mmedialib___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a @@ -256,158 +259,158 @@ install-strip: install @COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir) -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3): $(__mmediadll_PCH_DEP) $(MMEDIADLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3): $(MMEDIADLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__mmediadll___macinstnamecmd) $(__mmediadll___importlib) $(__mmediadll___soname_flags) $(__mmediadll___macver) $(EXTRALIBS_ESD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ @COND_SHARED_1@ $(__mmediadll___so_symlinks_cmd) -mmediadll_cdbase.o: $(srcdir)/cdbase.cpp +mmediadll_cdbase.o: $(srcdir)/cdbase.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -mmediadll_cdunix.o: $(srcdir)/cdunix.cpp +mmediadll_cdunix.o: $(srcdir)/cdunix.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -mmediadll_cdwin.o: $(srcdir)/cdwin.cpp +mmediadll_cdwin.o: $(srcdir)/cdwin.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -mmediadll_g711.o: $(srcdir)/g711.cpp +mmediadll_g711.o: $(srcdir)/g711.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -mmediadll_g721.o: $(srcdir)/g721.cpp +mmediadll_g721.o: $(srcdir)/g721.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -mmediadll_g723_24.o: $(srcdir)/g723_24.cpp +mmediadll_g723_24.o: $(srcdir)/g723_24.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -mmediadll_g723_40.o: $(srcdir)/g723_40.cpp +mmediadll_g723_40.o: $(srcdir)/g723_40.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -mmediadll_g72x.o: $(srcdir)/g72x.cpp +mmediadll_g72x.o: $(srcdir)/g72x.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -mmediadll_sndaiff.o: $(srcdir)/sndaiff.cpp +mmediadll_sndaiff.o: $(srcdir)/sndaiff.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -mmediadll_sndbase.o: $(srcdir)/sndbase.cpp +mmediadll_sndbase.o: $(srcdir)/sndbase.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -mmediadll_sndcodec.o: $(srcdir)/sndcodec.cpp +mmediadll_sndcodec.o: $(srcdir)/sndcodec.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -mmediadll_sndcpcm.o: $(srcdir)/sndcpcm.cpp +mmediadll_sndcpcm.o: $(srcdir)/sndcpcm.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -mmediadll_sndesd.o: $(srcdir)/sndesd.cpp +mmediadll_sndesd.o: $(srcdir)/sndesd.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -mmediadll_sndfile.o: $(srcdir)/sndfile.cpp +mmediadll_sndfile.o: $(srcdir)/sndfile.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -mmediadll_sndg72x.o: $(srcdir)/sndg72x.cpp +mmediadll_sndg72x.o: $(srcdir)/sndg72x.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -mmediadll_sndmsad.o: $(srcdir)/sndmsad.cpp +mmediadll_sndmsad.o: $(srcdir)/sndmsad.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -mmediadll_sndoss.o: $(srcdir)/sndoss.cpp +mmediadll_sndoss.o: $(srcdir)/sndoss.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -mmediadll_sndpcm.o: $(srcdir)/sndpcm.cpp +mmediadll_sndpcm.o: $(srcdir)/sndpcm.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -mmediadll_sndulaw.o: $(srcdir)/sndulaw.cpp +mmediadll_sndulaw.o: $(srcdir)/sndulaw.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -mmediadll_sndwav.o: $(srcdir)/sndwav.cpp +mmediadll_sndwav.o: $(srcdir)/sndwav.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -mmediadll_sndwin.o: $(srcdir)/sndwin.cpp +mmediadll_sndwin.o: $(srcdir)/sndwin.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -mmediadll_vidbase.o: $(srcdir)/vidbase.cpp +mmediadll_vidbase.o: $(srcdir)/vidbase.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -mmediadll_vidwin.o: $(srcdir)/vidwin.cpp +mmediadll_vidwin.o: $(srcdir)/vidwin.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -mmediadll_vidxanm.o: $(srcdir)/vidxanm.cpp +mmediadll_vidxanm.o: $(srcdir)/vidxanm.cpp $(MMEDIADLL_ODEP) $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a: $(__mmedialib_PCH_DEP) $(MMEDIALIB_OBJECTS) +@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a: $(MMEDIALIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ $(MMEDIALIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ -mmedialib_cdbase.o: $(srcdir)/cdbase.cpp +mmedialib_cdbase.o: $(srcdir)/cdbase.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< -mmedialib_cdunix.o: $(srcdir)/cdunix.cpp +mmedialib_cdunix.o: $(srcdir)/cdunix.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< -mmedialib_cdwin.o: $(srcdir)/cdwin.cpp +mmedialib_cdwin.o: $(srcdir)/cdwin.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< -mmedialib_g711.o: $(srcdir)/g711.cpp +mmedialib_g711.o: $(srcdir)/g711.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< -mmedialib_g721.o: $(srcdir)/g721.cpp +mmedialib_g721.o: $(srcdir)/g721.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< -mmedialib_g723_24.o: $(srcdir)/g723_24.cpp +mmedialib_g723_24.o: $(srcdir)/g723_24.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< -mmedialib_g723_40.o: $(srcdir)/g723_40.cpp +mmedialib_g723_40.o: $(srcdir)/g723_40.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< -mmedialib_g72x.o: $(srcdir)/g72x.cpp +mmedialib_g72x.o: $(srcdir)/g72x.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< -mmedialib_sndaiff.o: $(srcdir)/sndaiff.cpp +mmedialib_sndaiff.o: $(srcdir)/sndaiff.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< -mmedialib_sndbase.o: $(srcdir)/sndbase.cpp +mmedialib_sndbase.o: $(srcdir)/sndbase.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< -mmedialib_sndcodec.o: $(srcdir)/sndcodec.cpp +mmedialib_sndcodec.o: $(srcdir)/sndcodec.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< -mmedialib_sndcpcm.o: $(srcdir)/sndcpcm.cpp +mmedialib_sndcpcm.o: $(srcdir)/sndcpcm.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< -mmedialib_sndesd.o: $(srcdir)/sndesd.cpp +mmedialib_sndesd.o: $(srcdir)/sndesd.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< -mmedialib_sndfile.o: $(srcdir)/sndfile.cpp +mmedialib_sndfile.o: $(srcdir)/sndfile.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< -mmedialib_sndg72x.o: $(srcdir)/sndg72x.cpp +mmedialib_sndg72x.o: $(srcdir)/sndg72x.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< -mmedialib_sndmsad.o: $(srcdir)/sndmsad.cpp +mmedialib_sndmsad.o: $(srcdir)/sndmsad.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< -mmedialib_sndoss.o: $(srcdir)/sndoss.cpp +mmedialib_sndoss.o: $(srcdir)/sndoss.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< -mmedialib_sndpcm.o: $(srcdir)/sndpcm.cpp +mmedialib_sndpcm.o: $(srcdir)/sndpcm.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< -mmedialib_sndulaw.o: $(srcdir)/sndulaw.cpp +mmedialib_sndulaw.o: $(srcdir)/sndulaw.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< -mmedialib_sndwav.o: $(srcdir)/sndwav.cpp +mmedialib_sndwav.o: $(srcdir)/sndwav.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< -mmedialib_sndwin.o: $(srcdir)/sndwin.cpp +mmedialib_sndwin.o: $(srcdir)/sndwin.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< -mmedialib_vidbase.o: $(srcdir)/vidbase.cpp +mmedialib_vidbase.o: $(srcdir)/vidbase.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< -mmedialib_vidwin.o: $(srcdir)/vidwin.cpp +mmedialib_vidwin.o: $(srcdir)/vidwin.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< -mmedialib_vidxanm.o: $(srcdir)/vidxanm.cpp +mmedialib_vidxanm.o: $(srcdir)/vidxanm.cpp $(MMEDIALIB_ODEP) $(CXXC) -c -o $@ $(MMEDIALIB_CXXFLAGS) $< uninstall: diff --git a/contrib/src/net/Makefile.in b/contrib/src/net/Makefile.in index de35376..856f65a 100644 --- a/contrib/src/net/Makefile.in +++ b/contrib/src/net/Makefile.in @@ -45,19 +45,20 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib NETUTILSDLL_CXXFLAGS = $(__netutilsdll_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -DWXUSINGDLL -DWXMAKINGDLL_NETUTILS $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \ + -DWXMAKINGDLL_NETUTILS $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) NETUTILSDLL_OBJECTS = \ netutilsdll_email.o \ netutilsdll_smapi.o \ netutilsdll_web.o +NETUTILSDLL_ODEP = $(___pch_wxprec_netutilsdll_wx_wxprec_h_gch___depname) NETUTILSLIB_CXXFLAGS = $(__netutilslib_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - $(CPPFLAGS) $(CXXFLAGS) + $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS) NETUTILSLIB_OBJECTS = \ netutilslib_email.o \ netutilslib_smapi.o \ netutilslib_web.o +NETUTILSLIB_ODEP = $(___pch_wxprec_netutilslib_wx_wxprec_h_gch___depname) WX_VERSION = 2.5.1 ### Conditionally set variables: ### @@ -106,10 +107,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_GCC_PCH_1@___pch_wxprec_netutilsdll_wx_wxprec_h_gch___depname \ +@COND_GCC_PCH_1@ = .pch/wxprec_netutilsdll/wx/wxprec.h.gch +@COND_GCC_PCH_1@___pch_wxprec_netutilslib_wx_wxprec_h_gch___depname \ +@COND_GCC_PCH_1@ = .pch/wxprec_netutilslib/wx/wxprec.h.gch @COND_SHARED_1@__install_netutilsdll___depname = install_netutilsdll @COND_SHARED_0@__install_netutilslib___depname = install_netutilslib -@COND_GCC_PCH_1@__netutilsdll_PCH_DEP = \ -@COND_GCC_PCH_1@ .pch/wxprec_netutilsdll/wx/wxprec.h.gch @COND_GCC_PCH_1@__netutilsdll_PCH_INC = -I.pch/wxprec_netutilsdll COND_SHARED_1___netutilsdll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) @@ -160,8 +163,6 @@ COND_USE_SOVERSOLARIS_1___netutilsdll___soname_flags = \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__netutilsdll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .1.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__netutilsdll___targetsuf3 = .$(SO_SUFFIX) -@COND_GCC_PCH_1@__netutilslib_PCH_DEP = \ -@COND_GCC_PCH_1@ .pch/wxprec_netutilslib/wx/wxprec.h.gch @COND_GCC_PCH_1@__netutilslib_PCH_INC = -I.pch/wxprec_netutilslib COND_SHARED_0___netutilslib___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).a @@ -210,32 +211,32 @@ install-strip: install @COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir) -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3): $(__netutilsdll_PCH_DEP) $(NETUTILSDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3): $(NETUTILSDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__netutilsdll___macinstnamecmd) $(__netutilsdll___importlib) $(__netutilsdll___soname_flags) $(__netutilsdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ @COND_SHARED_1@ $(__netutilsdll___so_symlinks_cmd) -netutilsdll_email.o: $(srcdir)/email.cpp +netutilsdll_email.o: $(srcdir)/email.cpp $(NETUTILSDLL_ODEP) $(CXXC) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $< -netutilsdll_smapi.o: $(srcdir)/smapi.cpp +netutilsdll_smapi.o: $(srcdir)/smapi.cpp $(NETUTILSDLL_ODEP) $(CXXC) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $< -netutilsdll_web.o: $(srcdir)/web.cpp +netutilsdll_web.o: $(srcdir)/web.cpp $(NETUTILSDLL_ODEP) $(CXXC) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $< -@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).a: $(__netutilslib_PCH_DEP) $(NETUTILSLIB_OBJECTS) +@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).a: $(NETUTILSLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ $(NETUTILSLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ -netutilslib_email.o: $(srcdir)/email.cpp +netutilslib_email.o: $(srcdir)/email.cpp $(NETUTILSLIB_ODEP) $(CXXC) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $< -netutilslib_smapi.o: $(srcdir)/smapi.cpp +netutilslib_smapi.o: $(srcdir)/smapi.cpp $(NETUTILSLIB_ODEP) $(CXXC) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $< -netutilslib_web.o: $(srcdir)/web.cpp +netutilslib_web.o: $(srcdir)/web.cpp $(NETUTILSLIB_ODEP) $(CXXC) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $< uninstall: diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in index 15e76f6..0fc9f94 100644 --- a/contrib/src/ogl/Makefile.in +++ b/contrib/src/ogl/Makefile.in @@ -45,8 +45,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib OGLDLL_CXXFLAGS = $(__ogldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir)/../../include -DWXUSINGDLL \ - -DWXMAKINGDLL_OGL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_OGL $(PIC_FLAG) \ + $(CPPFLAGS) $(CXXFLAGS) OGLDLL_OBJECTS = \ ogldll_basic2.o \ ogldll_canvas.o \ @@ -60,8 +60,9 @@ OGLDLL_OBJECTS = \ ogldll_constrnt.o \ ogldll_lines.o \ ogldll_ogldiag.o +OGLDLL_ODEP = $(___pch_wxprec_ogldll_wx_wxprec_h_gch___depname) OGLLIB_CXXFLAGS = $(__ogllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS) + -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS) OGLLIB_OBJECTS = \ ogllib_basic2.o \ ogllib_canvas.o \ @@ -75,6 +76,7 @@ OGLLIB_OBJECTS = \ ogllib_constrnt.o \ ogllib_lines.o \ ogllib_ogldiag.o +OGLLIB_ODEP = $(___pch_wxprec_ogllib_wx_wxprec_h_gch___depname) WX_VERSION = 2.5.1 ### Conditionally set variables: ### @@ -123,9 +125,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_GCC_PCH_1@___pch_wxprec_ogldll_wx_wxprec_h_gch___depname \ +@COND_GCC_PCH_1@ = .pch/wxprec_ogldll/wx/wxprec.h.gch +@COND_GCC_PCH_1@___pch_wxprec_ogllib_wx_wxprec_h_gch___depname \ +@COND_GCC_PCH_1@ = .pch/wxprec_ogllib/wx/wxprec.h.gch @COND_SHARED_1@__install_ogldll___depname = install_ogldll @COND_SHARED_0@__install_ogllib___depname = install_ogllib -@COND_GCC_PCH_1@__ogldll_PCH_DEP = .pch/wxprec_ogldll/wx/wxprec.h.gch @COND_GCC_PCH_1@__ogldll_PCH_INC = -I.pch/wxprec_ogldll COND_SHARED_1___ogldll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) @@ -175,7 +180,6 @@ COND_USE_SOVERSOLARIS_1___ogldll___soname_flags = \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .1.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__ogldll___targetsuf3 = .$(SO_SUFFIX) -@COND_GCC_PCH_1@__ogllib_PCH_DEP = .pch/wxprec_ogllib/wx/wxprec.h.gch @COND_GCC_PCH_1@__ogllib_PCH_INC = -I.pch/wxprec_ogllib COND_SHARED_0___ogllib___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a @@ -224,86 +228,86 @@ install-strip: install @COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir) -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(__ogldll_PCH_DEP) $(OGLDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(OGLDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(__ogldll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ @COND_SHARED_1@ $(__ogldll___so_symlinks_cmd) -ogldll_basic.o: $(srcdir)/basic.cpp +ogldll_basic.o: $(srcdir)/basic.cpp $(OGLDLL_ODEP) $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< -ogldll_basic2.o: $(srcdir)/basic2.cpp +ogldll_basic2.o: $(srcdir)/basic2.cpp $(OGLDLL_ODEP) $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< -ogldll_bmpshape.o: $(srcdir)/bmpshape.cpp +ogldll_bmpshape.o: $(srcdir)/bmpshape.cpp $(OGLDLL_ODEP) $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< -ogldll_canvas.o: $(srcdir)/canvas.cpp +ogldll_canvas.o: $(srcdir)/canvas.cpp $(OGLDLL_ODEP) $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< -ogldll_composit.o: $(srcdir)/composit.cpp +ogldll_composit.o: $(srcdir)/composit.cpp $(OGLDLL_ODEP) $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< -ogldll_constrnt.o: $(srcdir)/constrnt.cpp +ogldll_constrnt.o: $(srcdir)/constrnt.cpp $(OGLDLL_ODEP) $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< -ogldll_divided.o: $(srcdir)/divided.cpp +ogldll_divided.o: $(srcdir)/divided.cpp $(OGLDLL_ODEP) $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< -ogldll_drawn.o: $(srcdir)/drawn.cpp +ogldll_drawn.o: $(srcdir)/drawn.cpp $(OGLDLL_ODEP) $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< -ogldll_lines.o: $(srcdir)/lines.cpp +ogldll_lines.o: $(srcdir)/lines.cpp $(OGLDLL_ODEP) $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< -ogldll_mfutils.o: $(srcdir)/mfutils.cpp +ogldll_mfutils.o: $(srcdir)/mfutils.cpp $(OGLDLL_ODEP) $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< -ogldll_ogldiag.o: $(srcdir)/ogldiag.cpp +ogldll_ogldiag.o: $(srcdir)/ogldiag.cpp $(OGLDLL_ODEP) $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< -ogldll_oglmisc.o: $(srcdir)/oglmisc.cpp +ogldll_oglmisc.o: $(srcdir)/oglmisc.cpp $(OGLDLL_ODEP) $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< -@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a: $(__ogllib_PCH_DEP) $(OGLLIB_OBJECTS) +@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a: $(OGLLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ $(OGLLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ -ogllib_basic.o: $(srcdir)/basic.cpp +ogllib_basic.o: $(srcdir)/basic.cpp $(OGLLIB_ODEP) $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< -ogllib_basic2.o: $(srcdir)/basic2.cpp +ogllib_basic2.o: $(srcdir)/basic2.cpp $(OGLLIB_ODEP) $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< -ogllib_bmpshape.o: $(srcdir)/bmpshape.cpp +ogllib_bmpshape.o: $(srcdir)/bmpshape.cpp $(OGLLIB_ODEP) $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< -ogllib_canvas.o: $(srcdir)/canvas.cpp +ogllib_canvas.o: $(srcdir)/canvas.cpp $(OGLLIB_ODEP) $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< -ogllib_composit.o: $(srcdir)/composit.cpp +ogllib_composit.o: $(srcdir)/composit.cpp $(OGLLIB_ODEP) $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< -ogllib_constrnt.o: $(srcdir)/constrnt.cpp +ogllib_constrnt.o: $(srcdir)/constrnt.cpp $(OGLLIB_ODEP) $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< -ogllib_divided.o: $(srcdir)/divided.cpp +ogllib_divided.o: $(srcdir)/divided.cpp $(OGLLIB_ODEP) $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< -ogllib_drawn.o: $(srcdir)/drawn.cpp +ogllib_drawn.o: $(srcdir)/drawn.cpp $(OGLLIB_ODEP) $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< -ogllib_lines.o: $(srcdir)/lines.cpp +ogllib_lines.o: $(srcdir)/lines.cpp $(OGLLIB_ODEP) $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< -ogllib_mfutils.o: $(srcdir)/mfutils.cpp +ogllib_mfutils.o: $(srcdir)/mfutils.cpp $(OGLLIB_ODEP) $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< -ogllib_ogldiag.o: $(srcdir)/ogldiag.cpp +ogllib_ogldiag.o: $(srcdir)/ogldiag.cpp $(OGLLIB_ODEP) $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< -ogllib_oglmisc.o: $(srcdir)/oglmisc.cpp +ogllib_oglmisc.o: $(srcdir)/oglmisc.cpp $(OGLLIB_ODEP) $(CXXC) -c -o $@ $(OGLLIB_CXXFLAGS) $< uninstall: diff --git a/contrib/src/plot/Makefile.in b/contrib/src/plot/Makefile.in index be938b2..e37b5a4 100644 --- a/contrib/src/plot/Makefile.in +++ b/contrib/src/plot/Makefile.in @@ -45,15 +45,16 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib PLOTDLL_CXXFLAGS = $(__plotdll_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -DWXUSINGDLL -DWXMAKINGDLL_PLOT $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \ + -DWXMAKINGDLL_PLOT $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) PLOTDLL_OBJECTS = \ plotdll_plot.o +PLOTDLL_ODEP = $(___pch_wxprec_plotdll_wx_wxprec_h_gch___depname) PLOTLIB_CXXFLAGS = $(__plotlib_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ - $(CPPFLAGS) $(CXXFLAGS) + $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS) PLOTLIB_OBJECTS = \ plotlib_plot.o +PLOTLIB_ODEP = $(___pch_wxprec_plotlib_wx_wxprec_h_gch___depname) WX_VERSION = 2.5.1 ### Conditionally set variables: ### @@ -102,9 +103,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_GCC_PCH_1@___pch_wxprec_plotdll_wx_wxprec_h_gch___depname \ +@COND_GCC_PCH_1@ = .pch/wxprec_plotdll/wx/wxprec.h.gch +@COND_GCC_PCH_1@___pch_wxprec_plotlib_wx_wxprec_h_gch___depname \ +@COND_GCC_PCH_1@ = .pch/wxprec_plotlib/wx/wxprec.h.gch @COND_SHARED_1@__install_plotdll___depname = install_plotdll @COND_SHARED_0@__install_plotlib___depname = install_plotlib -@COND_GCC_PCH_1@__plotdll_PCH_DEP = .pch/wxprec_plotdll/wx/wxprec.h.gch @COND_GCC_PCH_1@__plotdll_PCH_INC = -I.pch/wxprec_plotdll COND_SHARED_1___plotdll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3) @@ -154,7 +158,6 @@ COND_USE_SOVERSOLARIS_1___plotdll___soname_flags = \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__plotdll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .1.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__plotdll___targetsuf3 = .$(SO_SUFFIX) -@COND_GCC_PCH_1@__plotlib_PCH_DEP = .pch/wxprec_plotlib/wx/wxprec.h.gch @COND_GCC_PCH_1@__plotlib_PCH_INC = -I.pch/wxprec_plotlib COND_SHARED_0___plotlib___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).a @@ -203,20 +206,20 @@ install-strip: install @COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir) -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3): $(__plotdll_PCH_DEP) $(PLOTDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3): $(PLOTDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(PLOTDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__plotdll___macinstnamecmd) $(__plotdll___importlib) $(__plotdll___soname_flags) $(__plotdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ @COND_SHARED_1@ $(__plotdll___so_symlinks_cmd) -plotdll_plot.o: $(srcdir)/plot.cpp +plotdll_plot.o: $(srcdir)/plot.cpp $(PLOTDLL_ODEP) $(CXXC) -c -o $@ $(PLOTDLL_CXXFLAGS) $< -@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).a: $(__plotlib_PCH_DEP) $(PLOTLIB_OBJECTS) +@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).a: $(PLOTLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ $(PLOTLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ -plotlib_plot.o: $(srcdir)/plot.cpp +plotlib_plot.o: $(srcdir)/plot.cpp $(PLOTLIB_ODEP) $(CXXC) -c -o $@ $(PLOTLIB_CXXFLAGS) $< uninstall: diff --git a/contrib/src/stc/Makefile.in b/contrib/src/stc/Makefile.in index 12fc8e2..7405600 100644 --- a/contrib/src/stc/Makefile.in +++ b/contrib/src/stc/Makefile.in @@ -45,10 +45,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib STCDLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -I$(srcdir)/scintilla/include -I$(srcdir)/scintilla/src -D__WX__ \ - -DSCI_LEXER -DLINK_LEXERS -DWXUSINGDLL -DWXMAKINGDLL_STC $(PIC_FLAG) \ - $(CPPFLAGS) $(CXXFLAGS) + -I$(srcdir)/../../include -I$(srcdir)/scintilla/include \ + -I$(srcdir)/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS -DWXUSINGDLL \ + -DWXMAKINGDLL_STC $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) STCDLL_OBJECTS = \ stcdll_PlatWX.o \ stcdll_ScintillaWX.o \ @@ -104,9 +103,9 @@ STCDLL_OBJECTS = \ stcdll_WindowAccessor.o \ stcdll_XPM.o STCLIB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -I$(srcdir)/scintilla/include -I$(srcdir)/scintilla/src -D__WX__ \ - -DSCI_LEXER -DLINK_LEXERS $(CPPFLAGS) $(CXXFLAGS) + -I$(srcdir)/../../include -I$(srcdir)/scintilla/include \ + -I$(srcdir)/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CPPFLAGS) \ + $(CXXFLAGS) STCLIB_OBJECTS = \ stclib_PlatWX.o \ stclib_ScintillaWX.o \ diff --git a/contrib/src/svg/Makefile.in b/contrib/src/svg/Makefile.in index 75e8e70..b52f776 100644 --- a/contrib/src/svg/Makefile.in +++ b/contrib/src/svg/Makefile.in @@ -45,14 +45,16 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib SVGDLL_CXXFLAGS = $(__svgdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir)/../../include -DWXUSINGDLL \ - -DWXMAKINGDLL_SVG $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_SVG $(PIC_FLAG) \ + $(CPPFLAGS) $(CXXFLAGS) SVGDLL_OBJECTS = \ svgdll_dcsvg.o +SVGDLL_ODEP = $(___pch_wxprec_svgdll_wx_wxprec_h_gch___depname) SVGLIB_CXXFLAGS = $(__svglib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS) + -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS) SVGLIB_OBJECTS = \ svglib_dcsvg.o +SVGLIB_ODEP = $(___pch_wxprec_svglib_wx_wxprec_h_gch___depname) WX_VERSION = 2.5.1 ### Conditionally set variables: ### @@ -101,9 +103,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_GCC_PCH_1@___pch_wxprec_svgdll_wx_wxprec_h_gch___depname \ +@COND_GCC_PCH_1@ = .pch/wxprec_svgdll/wx/wxprec.h.gch +@COND_GCC_PCH_1@___pch_wxprec_svglib_wx_wxprec_h_gch___depname \ +@COND_GCC_PCH_1@ = .pch/wxprec_svglib/wx/wxprec.h.gch @COND_SHARED_1@__install_svgdll___depname = install_svgdll @COND_SHARED_0@__install_svglib___depname = install_svglib -@COND_GCC_PCH_1@__svgdll_PCH_DEP = .pch/wxprec_svgdll/wx/wxprec.h.gch @COND_GCC_PCH_1@__svgdll_PCH_INC = -I.pch/wxprec_svgdll COND_SHARED_1___svgdll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) @@ -153,7 +158,6 @@ COND_USE_SOVERSOLARIS_1___svgdll___soname_flags = \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__svgdll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .1.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__svgdll___targetsuf3 = .$(SO_SUFFIX) -@COND_GCC_PCH_1@__svglib_PCH_DEP = .pch/wxprec_svglib/wx/wxprec.h.gch @COND_GCC_PCH_1@__svglib_PCH_INC = -I.pch/wxprec_svglib COND_SHARED_0___svglib___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).a @@ -202,20 +206,20 @@ install-strip: install @COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir) -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3): $(__svgdll_PCH_DEP) $(SVGDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3): $(SVGDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(SVGDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__svgdll___macinstnamecmd) $(__svgdll___importlib) $(__svgdll___soname_flags) $(__svgdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ @COND_SHARED_1@ $(__svgdll___so_symlinks_cmd) -svgdll_dcsvg.o: $(srcdir)/dcsvg.cpp +svgdll_dcsvg.o: $(srcdir)/dcsvg.cpp $(SVGDLL_ODEP) $(CXXC) -c -o $@ $(SVGDLL_CXXFLAGS) $< -@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).a: $(__svglib_PCH_DEP) $(SVGLIB_OBJECTS) +@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).a: $(SVGLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ $(SVGLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ -svglib_dcsvg.o: $(srcdir)/dcsvg.cpp +svglib_dcsvg.o: $(srcdir)/dcsvg.cpp $(SVGLIB_ODEP) $(CXXC) -c -o $@ $(SVGLIB_CXXFLAGS) $< uninstall: diff --git a/contrib/src/xrc/Makefile.in b/contrib/src/xrc/Makefile.in index d465aca..d6a56de 100644 --- a/contrib/src/xrc/Makefile.in +++ b/contrib/src/xrc/Makefile.in @@ -48,8 +48,8 @@ DESTDIR = LIBDIRNAME = $(top_builddir)lib WX_VERSION = 2.5.1 XRCDLL_CXXFLAGS = $(__xrcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir)/../../include -DWXUSINGDLL \ - -DWXMAKINGDLL_XRC $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_XRC $(PIC_FLAG) \ + $(CPPFLAGS) $(CXXFLAGS) XRCDLL_OBJECTS = \ xrcdll_xmlres.o \ xrcdll_xh_bmp.o \ @@ -88,9 +88,10 @@ XRCDLL_OBJECTS = \ xrcdll_xh_unkwn.o \ xrcdll_xh_wizrd.o \ xrcdll_xmlrsall.o +XRCDLL_ODEP = $(___pch_wxprec_xrcdll_wx_wxprec_h_gch___depname) XRCLIB_CXXFLAGS = $(__xrclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CPPFLAGS) $(CXXFLAGS) + -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse \ + -I$(srcdir)/expat/xmltok $(CPPFLAGS) $(CXXFLAGS) XRCLIB_OBJECTS = \ xrclib_xmlres.o \ xrclib_xh_bmp.o \ @@ -129,6 +130,7 @@ XRCLIB_OBJECTS = \ xrclib_xh_unkwn.o \ xrclib_xh_wizrd.o \ xrclib_xmlrsall.o +XRCLIB_ODEP = $(___pch_wxprec_xrclib_wx_wxprec_h_gch___depname) ### Conditionally set variables: ### @@ -184,9 +186,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_MONOLITHIC_0@__WXLIB_XML_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_GCC_PCH_1@___pch_wxprec_xrcdll_wx_wxprec_h_gch___depname \ +@COND_GCC_PCH_1@ = .pch/wxprec_xrcdll/wx/wxprec.h.gch +@COND_GCC_PCH_1@___pch_wxprec_xrclib_wx_wxprec_h_gch___depname \ +@COND_GCC_PCH_1@ = .pch/wxprec_xrclib/wx/wxprec.h.gch @COND_SHARED_1@__install_xrcdll___depname = install_xrcdll @COND_SHARED_0@__install_xrclib___depname = install_xrclib -@COND_GCC_PCH_1@__xrcdll_PCH_DEP = .pch/wxprec_xrcdll/wx/wxprec.h.gch @COND_GCC_PCH_1@__xrcdll_PCH_INC = -I.pch/wxprec_xrcdll COND_SHARED_1___xrcdll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) @@ -236,7 +241,6 @@ COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags = \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .1.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__xrcdll___targetsuf3 = .$(SO_SUFFIX) -@COND_GCC_PCH_1@__xrclib_PCH_DEP = .pch/wxprec_xrclib/wx/wxprec.h.gch @COND_GCC_PCH_1@__xrclib_PCH_INC = -I.pch/wxprec_xrclib COND_SHARED_0___xrclib___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a @@ -287,236 +291,236 @@ install-strip: install uninstall: -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): $(__xrcdll_PCH_DEP) $(XRCDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): $(XRCDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(__xrcdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) @COND_SHARED_1@ @COND_SHARED_1@ $(__xrcdll___so_symlinks_cmd) -xrcdll_xh_bmp.o: $(srcdir)/xh_bmp.cpp +xrcdll_xh_bmp.o: $(srcdir)/xh_bmp.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp +xrcdll_xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_bttn.o: $(srcdir)/xh_bttn.cpp +xrcdll_xh_bttn.o: $(srcdir)/xh_bttn.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_cald.o: $(srcdir)/xh_cald.cpp +xrcdll_xh_cald.o: $(srcdir)/xh_cald.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_chckb.o: $(srcdir)/xh_chckb.cpp +xrcdll_xh_chckb.o: $(srcdir)/xh_chckb.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_chckl.o: $(srcdir)/xh_chckl.cpp +xrcdll_xh_chckl.o: $(srcdir)/xh_chckl.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_choic.o: $(srcdir)/xh_choic.cpp +xrcdll_xh_choic.o: $(srcdir)/xh_choic.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_combo.o: $(srcdir)/xh_combo.cpp +xrcdll_xh_combo.o: $(srcdir)/xh_combo.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_dlg.o: $(srcdir)/xh_dlg.cpp +xrcdll_xh_dlg.o: $(srcdir)/xh_dlg.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_frame.o: $(srcdir)/xh_frame.cpp +xrcdll_xh_frame.o: $(srcdir)/xh_frame.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_gauge.o: $(srcdir)/xh_gauge.cpp +xrcdll_xh_gauge.o: $(srcdir)/xh_gauge.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_gdctl.o: $(srcdir)/xh_gdctl.cpp +xrcdll_xh_gdctl.o: $(srcdir)/xh_gdctl.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_html.o: $(srcdir)/xh_html.cpp +xrcdll_xh_html.o: $(srcdir)/xh_html.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_listb.o: $(srcdir)/xh_listb.cpp +xrcdll_xh_listb.o: $(srcdir)/xh_listb.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_listc.o: $(srcdir)/xh_listc.cpp +xrcdll_xh_listc.o: $(srcdir)/xh_listc.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_menu.o: $(srcdir)/xh_menu.cpp +xrcdll_xh_menu.o: $(srcdir)/xh_menu.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_notbk.o: $(srcdir)/xh_notbk.cpp +xrcdll_xh_notbk.o: $(srcdir)/xh_notbk.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_panel.o: $(srcdir)/xh_panel.cpp +xrcdll_xh_panel.o: $(srcdir)/xh_panel.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_radbt.o: $(srcdir)/xh_radbt.cpp +xrcdll_xh_radbt.o: $(srcdir)/xh_radbt.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_radbx.o: $(srcdir)/xh_radbx.cpp +xrcdll_xh_radbx.o: $(srcdir)/xh_radbx.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_scrol.o: $(srcdir)/xh_scrol.cpp +xrcdll_xh_scrol.o: $(srcdir)/xh_scrol.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_scwin.o: $(srcdir)/xh_scwin.cpp +xrcdll_xh_scwin.o: $(srcdir)/xh_scwin.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_sizer.o: $(srcdir)/xh_sizer.cpp +xrcdll_xh_sizer.o: $(srcdir)/xh_sizer.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_slidr.o: $(srcdir)/xh_slidr.cpp +xrcdll_xh_slidr.o: $(srcdir)/xh_slidr.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_spin.o: $(srcdir)/xh_spin.cpp +xrcdll_xh_spin.o: $(srcdir)/xh_spin.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_split.o: $(srcdir)/xh_split.cpp +xrcdll_xh_split.o: $(srcdir)/xh_split.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_stbmp.o: $(srcdir)/xh_stbmp.cpp +xrcdll_xh_stbmp.o: $(srcdir)/xh_stbmp.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_stbox.o: $(srcdir)/xh_stbox.cpp +xrcdll_xh_stbox.o: $(srcdir)/xh_stbox.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_stlin.o: $(srcdir)/xh_stlin.cpp +xrcdll_xh_stlin.o: $(srcdir)/xh_stlin.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_sttxt.o: $(srcdir)/xh_sttxt.cpp +xrcdll_xh_sttxt.o: $(srcdir)/xh_sttxt.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_text.o: $(srcdir)/xh_text.cpp +xrcdll_xh_text.o: $(srcdir)/xh_text.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_toolb.o: $(srcdir)/xh_toolb.cpp +xrcdll_xh_toolb.o: $(srcdir)/xh_toolb.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_tree.o: $(srcdir)/xh_tree.cpp +xrcdll_xh_tree.o: $(srcdir)/xh_tree.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_unkwn.o: $(srcdir)/xh_unkwn.cpp +xrcdll_xh_unkwn.o: $(srcdir)/xh_unkwn.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_wizrd.o: $(srcdir)/xh_wizrd.cpp +xrcdll_xh_wizrd.o: $(srcdir)/xh_wizrd.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xmlres.o: $(srcdir)/xmlres.cpp +xrcdll_xmlres.o: $(srcdir)/xmlres.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xmlrsall.o: $(srcdir)/xmlrsall.cpp +xrcdll_xmlrsall.o: $(srcdir)/xmlrsall.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a: $(__xrclib_PCH_DEP) $(XRCLIB_OBJECTS) +@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a: $(XRCLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ $(XRCLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ -xrclib_xh_bmp.o: $(srcdir)/xh_bmp.cpp +xrclib_xh_bmp.o: $(srcdir)/xh_bmp.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp +xrclib_xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_bttn.o: $(srcdir)/xh_bttn.cpp +xrclib_xh_bttn.o: $(srcdir)/xh_bttn.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_cald.o: $(srcdir)/xh_cald.cpp +xrclib_xh_cald.o: $(srcdir)/xh_cald.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_chckb.o: $(srcdir)/xh_chckb.cpp +xrclib_xh_chckb.o: $(srcdir)/xh_chckb.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_chckl.o: $(srcdir)/xh_chckl.cpp +xrclib_xh_chckl.o: $(srcdir)/xh_chckl.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_choic.o: $(srcdir)/xh_choic.cpp +xrclib_xh_choic.o: $(srcdir)/xh_choic.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_combo.o: $(srcdir)/xh_combo.cpp +xrclib_xh_combo.o: $(srcdir)/xh_combo.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_dlg.o: $(srcdir)/xh_dlg.cpp +xrclib_xh_dlg.o: $(srcdir)/xh_dlg.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_frame.o: $(srcdir)/xh_frame.cpp +xrclib_xh_frame.o: $(srcdir)/xh_frame.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_gauge.o: $(srcdir)/xh_gauge.cpp +xrclib_xh_gauge.o: $(srcdir)/xh_gauge.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_gdctl.o: $(srcdir)/xh_gdctl.cpp +xrclib_xh_gdctl.o: $(srcdir)/xh_gdctl.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_html.o: $(srcdir)/xh_html.cpp +xrclib_xh_html.o: $(srcdir)/xh_html.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_listb.o: $(srcdir)/xh_listb.cpp +xrclib_xh_listb.o: $(srcdir)/xh_listb.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_listc.o: $(srcdir)/xh_listc.cpp +xrclib_xh_listc.o: $(srcdir)/xh_listc.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_menu.o: $(srcdir)/xh_menu.cpp +xrclib_xh_menu.o: $(srcdir)/xh_menu.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_notbk.o: $(srcdir)/xh_notbk.cpp +xrclib_xh_notbk.o: $(srcdir)/xh_notbk.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_panel.o: $(srcdir)/xh_panel.cpp +xrclib_xh_panel.o: $(srcdir)/xh_panel.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_radbt.o: $(srcdir)/xh_radbt.cpp +xrclib_xh_radbt.o: $(srcdir)/xh_radbt.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_radbx.o: $(srcdir)/xh_radbx.cpp +xrclib_xh_radbx.o: $(srcdir)/xh_radbx.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_scrol.o: $(srcdir)/xh_scrol.cpp +xrclib_xh_scrol.o: $(srcdir)/xh_scrol.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_scwin.o: $(srcdir)/xh_scwin.cpp +xrclib_xh_scwin.o: $(srcdir)/xh_scwin.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_sizer.o: $(srcdir)/xh_sizer.cpp +xrclib_xh_sizer.o: $(srcdir)/xh_sizer.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_slidr.o: $(srcdir)/xh_slidr.cpp +xrclib_xh_slidr.o: $(srcdir)/xh_slidr.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_spin.o: $(srcdir)/xh_spin.cpp +xrclib_xh_spin.o: $(srcdir)/xh_spin.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_split.o: $(srcdir)/xh_split.cpp +xrclib_xh_split.o: $(srcdir)/xh_split.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_stbmp.o: $(srcdir)/xh_stbmp.cpp +xrclib_xh_stbmp.o: $(srcdir)/xh_stbmp.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_stbox.o: $(srcdir)/xh_stbox.cpp +xrclib_xh_stbox.o: $(srcdir)/xh_stbox.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_stlin.o: $(srcdir)/xh_stlin.cpp +xrclib_xh_stlin.o: $(srcdir)/xh_stlin.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_sttxt.o: $(srcdir)/xh_sttxt.cpp +xrclib_xh_sttxt.o: $(srcdir)/xh_sttxt.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_text.o: $(srcdir)/xh_text.cpp +xrclib_xh_text.o: $(srcdir)/xh_text.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_toolb.o: $(srcdir)/xh_toolb.cpp +xrclib_xh_toolb.o: $(srcdir)/xh_toolb.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_tree.o: $(srcdir)/xh_tree.cpp +xrclib_xh_tree.o: $(srcdir)/xh_tree.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_unkwn.o: $(srcdir)/xh_unkwn.cpp +xrclib_xh_unkwn.o: $(srcdir)/xh_unkwn.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_wizrd.o: $(srcdir)/xh_wizrd.cpp +xrclib_xh_wizrd.o: $(srcdir)/xh_wizrd.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xmlres.o: $(srcdir)/xmlres.cpp +xrclib_xmlres.o: $(srcdir)/xmlres.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xmlrsall.o: $(srcdir)/xmlrsall.cpp +xrclib_xmlrsall.o: $(srcdir)/xmlrsall.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< diff --git a/contrib/utils/convertrc/Makefile.in b/contrib/utils/convertrc/Makefile.in index d5efdd4..4ac65fe 100644 --- a/contrib/utils/convertrc/Makefile.in +++ b/contrib/utils/convertrc/Makefile.in @@ -37,10 +37,9 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CONVERTRC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \ - $(CXXFLAGS) +CONVERTRC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ + $(CPPFLAGS) $(CXXFLAGS) CONVERTRC_OBJECTS = \ $(__convertrc_os2_lib_res) \ convertrc_convert.o \ @@ -83,10 +82,9 @@ LIBDIRNAME = $(top_builddir)lib @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \ - convertrc$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \ - sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -i $(srcdir)/../../include -o convertrc$(EXEEXT) \ + Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -136,7 +134,7 @@ convertrc_rc2xml.o: $(srcdir)/rc2xml.cpp $(CXXC) -c -o $@ $(CONVERTRC_CXXFLAGS) $< convertrc_wxconvert_rc.o: $(srcdir)/wxconvert.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include convertrc_wxr2xml.o: $(srcdir)/wxr2xml.cpp $(CXXC) -c -o $@ $(CONVERTRC_CXXFLAGS) $< diff --git a/contrib/utils/convertrc/makefile.bcc b/contrib/utils/convertrc/makefile.bcc index 4b0e715..ff7233d 100644 --- a/contrib/utils/convertrc/makefile.bcc +++ b/contrib/utils/convertrc/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,17 +19,13 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -CONVERTRC_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +CONVERTRC_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \ - $(CXXFLAGS) + $(CPPFLAGS) $(CXXFLAGS) CONVERTRC_OBJECTS = \ $(OBJS)\convertrc_convert.obj \ $(OBJS)\convertrc_rc2wxr.obj \ @@ -186,6 +187,6 @@ clean: -if exist $(OBJS)\convertrc.ils del $(OBJS)\convertrc.ils $(OBJS)\convertrc.exe: $(CONVERTRC_OBJECTS) $(OBJS)\convertrc_wxconvert.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(CONVERTRC_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\convertrc_wxconvert.res | diff --git a/contrib/utils/convertrc/makefile.gcc b/contrib/utils/convertrc/makefile.gcc index b526bd5..0a52083 100644 --- a/contrib/utils/convertrc/makefile.gcc +++ b/contrib/utils/convertrc/makefile.gcc @@ -12,11 +12,11 @@ include ../../../build/msw/config.gcc ### Variables: ### -CONVERTRC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +CONVERTRC_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) CONVERTRC_OBJECTS = \ $(OBJS)\convertrc_convert.o \ $(OBJS)\convertrc_rc2wxr.o \ diff --git a/contrib/utils/convertrc/makefile.vc b/contrib/utils/convertrc/makefile.vc index 0952f79..471881d 100644 --- a/contrib/utils/convertrc/makefile.vc +++ b/contrib/utils/convertrc/makefile.vc @@ -12,12 +12,13 @@ ### Variables: ### -CONVERTRC_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\convertrc.pdb $(____DEBUGRUNTIME_2_p) \ +CONVERTRC_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\convertrc.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - /I.\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /I.\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) \ + $(CXXFLAGS) CONVERTRC_OBJECTS = \ $(OBJS)\convertrc_convert.obj \ $(OBJS)\convertrc_rc2wxr.obj \ diff --git a/contrib/utils/convertrc/makefile.wat b/contrib/utils/convertrc/makefile.wat index c117226..285894d 100644 --- a/contrib/utils/convertrc/makefile.wat +++ b/contrib/utils/convertrc/makefile.wat @@ -171,11 +171,11 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -CONVERTRC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +CONVERTRC_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include $(CXXFLAGS) & - $(__EXCEPTIONSFLAG_7) + $(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) CONVERTRC_OBJECTS = & $(OBJS)\convertrc_convert.obj & $(OBJS)\convertrc_rc2wxr.obj & diff --git a/contrib/utils/wxrc/Makefile.in b/contrib/utils/wxrc/Makefile.in index 59d32bf..7455957 100644 --- a/contrib/utils/wxrc/Makefile.in +++ b/contrib/utils/wxrc/Makefile.in @@ -35,8 +35,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WXRC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS) +WXRC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS) WXRC_OBJECTS = \ wxrc_wxrc.o diff --git a/contrib/utils/wxrc/makefile.bcc b/contrib/utils/wxrc/makefile.bcc index 12e286b..5fcb532 100644 --- a/contrib/utils/wxrc/makefile.bcc +++ b/contrib/utils/wxrc/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,16 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXRC_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +WXRC_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) $(CXXFLAGS) + -I$(SETUPHDIR) -I. $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS) WXRC_OBJECTS = \ $(OBJS)\wxrc_wxrc.obj @@ -151,6 +152,6 @@ clean: -if exist $(OBJS)\wxrc.ils del $(OBJS)\wxrc.ils $(OBJS)\wxrc.exe: $(WXRC_OBJECTS) - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&| c0x32.obj $(WXRC_OBJECTS),$@,, $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, | diff --git a/contrib/utils/wxrc/makefile.gcc b/contrib/utils/wxrc/makefile.gcc index c7ba420..57d676a 100644 --- a/contrib/utils/wxrc/makefile.gcc +++ b/contrib/utils/wxrc/makefile.gcc @@ -16,10 +16,10 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXRC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) +WXRC_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) WXRC_OBJECTS = \ $(OBJS)\wxrc_wxrc.o diff --git a/contrib/utils/wxrc/makefile.vc b/contrib/utils/wxrc/makefile.vc index ed0ec76..d39d49e 100644 --- a/contrib/utils/wxrc/makefile.vc +++ b/contrib/utils/wxrc/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXRC_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +WXRC_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\wxrc.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ - /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) WXRC_OBJECTS = \ $(OBJS)\wxrc_wxrc.obj diff --git a/contrib/utils/wxrc/makefile.wat b/contrib/utils/wxrc/makefile.wat index f5220ae..530748d 100644 --- a/contrib/utils/wxrc/makefile.wat +++ b/contrib/utils/wxrc/makefile.wat @@ -170,10 +170,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXRC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +WXRC_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) WXRC_OBJECTS = & $(OBJS)\wxrc_wxrc.obj diff --git a/contrib/utils/wxrcedit/Makefile.in b/contrib/utils/wxrcedit/Makefile.in index 811b09a..69ed41d 100644 --- a/contrib/utils/wxrcedit/Makefile.in +++ b/contrib/utils/wxrcedit/Makefile.in @@ -40,10 +40,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WXRCEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \ - $(CXXFLAGS) +WXRCEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ + $(CPPFLAGS) $(CXXFLAGS) WXRCEDIT_OBJECTS = \ $(__wxrcedit_os2_lib_res) \ wxrcedit_edapp.o \ @@ -91,10 +90,9 @@ WXRCEDIT_OBJECTS = \ @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \ - wxrcedit$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \ - sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -i $(srcdir)/../../include -o wxrcedit$(EXEEXT) \ + Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX) @@ -185,7 +183,7 @@ wxrcedit_splittree.o: $(srcdir)/splittree.cpp $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $< wxrcedit_wxrcedit_rc.o: $(srcdir)/wxrcedit.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include wxrcedit_xmlhelpr.o: $(srcdir)/xmlhelpr.cpp $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $< diff --git a/contrib/utils/wxrcedit/makefile.bcc b/contrib/utils/wxrcedit/makefile.bcc index e301263..9ee182f 100644 --- a/contrib/utils/wxrcedit/makefile.bcc +++ b/contrib/utils/wxrcedit/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,21 +19,17 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXRCEDIT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +WXRCEDIT_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \ - $(CXXFLAGS) + $(CPPFLAGS) $(CXXFLAGS) WXRCEDIT_OBJECTS = \ $(OBJS)\wxrcedit_edapp.obj \ $(OBJS)\wxrcedit_editor.obj \ @@ -222,6 +223,6 @@ clean: -if exist $(OBJS)\wxrcedit.ils del $(OBJS)\wxrcedit.ils $(OBJS)\wxrcedit.exe: $(WXRCEDIT_OBJECTS) $(OBJS)\wxrcedit_wxrcedit.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(WXRCEDIT_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\wxrcedit_wxrcedit.res | diff --git a/contrib/utils/wxrcedit/makefile.gcc b/contrib/utils/wxrcedit/makefile.gcc index 8f3424c..ef06c50 100644 --- a/contrib/utils/wxrcedit/makefile.gcc +++ b/contrib/utils/wxrcedit/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXRCEDIT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +WXRCEDIT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) WXRCEDIT_OBJECTS = \ $(OBJS)\wxrcedit_edapp.o \ $(OBJS)\wxrcedit_editor.o \ diff --git a/contrib/utils/wxrcedit/makefile.vc b/contrib/utils/wxrcedit/makefile.vc index e9f2e5e..cd67b24 100644 --- a/contrib/utils/wxrcedit/makefile.vc +++ b/contrib/utils/wxrcedit/makefile.vc @@ -16,12 +16,13 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXRCEDIT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\wxrcedit.pdb $(____DEBUGRUNTIME_2_p) \ +WXRCEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\wxrcedit.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - /I.\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /I.\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) \ + $(CXXFLAGS) WXRCEDIT_OBJECTS = \ $(OBJS)\wxrcedit_edapp.obj \ $(OBJS)\wxrcedit_editor.obj \ diff --git a/contrib/utils/wxrcedit/makefile.wat b/contrib/utils/wxrcedit/makefile.wat index 7d488ea..f4c3dbf 100644 --- a/contrib/utils/wxrcedit/makefile.wat +++ b/contrib/utils/wxrcedit/makefile.wat @@ -185,11 +185,11 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXRCEDIT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +WXRCEDIT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include $(CXXFLAGS) & - $(__EXCEPTIONSFLAG_7) + $(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) WXRCEDIT_OBJECTS = & $(OBJS)\wxrcedit_edapp.obj & $(OBJS)\wxrcedit_editor.obj & diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in index 09cf149..817ce15 100644 --- a/demos/bombs/Makefile.in +++ b/demos/bombs/Makefile.in @@ -34,9 +34,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### -BOMBS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +BOMBS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) BOMBS_OBJECTS = \ $(__bombs_os2_lib_res) \ bombs_bombs.o \ @@ -79,8 +78,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o bombs$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o bombs$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -144,7 +143,7 @@ bombs_bombs1.o: $(srcdir)/bombs1.cpp $(CXXC) -c -o $@ $(BOMBS_CXXFLAGS) $< bombs_bombs_rc.o: $(srcdir)/bombs.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples @COND_PLATFORM_MACOSX_1@bombs_bundle: bombs.app/Contents/PkgInfo diff --git a/demos/bombs/makefile.bcc b/demos/bombs/makefile.bcc index 2690e3c..03e2b8f 100644 --- a/demos/bombs/makefile.bcc +++ b/demos/bombs/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -BOMBS_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +BOMBS_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) BOMBS_OBJECTS = \ $(OBJS)\bombs_bombs.obj \ $(OBJS)\bombs_bombs1.obj \ @@ -168,7 +169,7 @@ $(OBJS)\bombs_game.obj: .\game.cpp $(CXX) -q -c -P -o$@ $(BOMBS_CXXFLAGS) $** $(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(BOMBS_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\bombs_bombs.res | diff --git a/demos/bombs/makefile.gcc b/demos/bombs/makefile.gcc index ab0ff22..e6661b7f 100644 --- a/demos/bombs/makefile.gcc +++ b/demos/bombs/makefile.gcc @@ -12,11 +12,10 @@ include ../../build/msw/config.gcc ### Variables: ### -BOMBS_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +BOMBS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) BOMBS_OBJECTS = \ $(OBJS)\bombs_bombs.o \ $(OBJS)\bombs_bombs1.o \ diff --git a/demos/bombs/makefile.vc b/demos/bombs/makefile.vc index 52ad39c..7570c21 100644 --- a/demos/bombs/makefile.vc +++ b/demos/bombs/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -BOMBS_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +BOMBS_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\bombs.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) BOMBS_OBJECTS = \ $(OBJS)\bombs_bombs.obj \ $(OBJS)\bombs_bombs1.obj \ diff --git a/demos/bombs/makefile.wat b/demos/bombs/makefile.wat index 83ae72c..ef68f9e 100644 --- a/demos/bombs/makefile.wat +++ b/demos/bombs/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -BOMBS_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +BOMBS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) BOMBS_OBJECTS = & $(OBJS)\bombs_bombs.obj & $(OBJS)\bombs_bombs1.obj & diff --git a/demos/dbbrowse/Makefile.in b/demos/dbbrowse/Makefile.in index 34a135f..465a700 100644 --- a/demos/dbbrowse/Makefile.in +++ b/demos/dbbrowse/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### -DBBROWSE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +DBBROWSE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) DBBROWSE_OBJECTS = \ $(__dbbrowse_os2_lib_res) \ dbbrowse_dbbrowse.o \ @@ -86,8 +85,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o dbbrowse$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o dbbrowse$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ @@ -171,7 +170,7 @@ dbbrowse_dbbrowse.o: $(srcdir)/dbbrowse.cpp $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $< dbbrowse_dbbrowse_rc.o: $(srcdir)/dbbrowse.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples dbbrowse_dbgrid.o: $(srcdir)/dbgrid.cpp $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $< diff --git a/demos/dbbrowse/makefile.bcc b/demos/dbbrowse/makefile.bcc index f4a246c..d802a76 100644 --- a/demos/dbbrowse/makefile.bcc +++ b/demos/dbbrowse/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -DBBROWSE_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +DBBROWSE_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) DBBROWSE_OBJECTS = \ $(OBJS)\dbbrowse_dbbrowse.obj \ $(OBJS)\dbbrowse_doc.obj \ @@ -213,6 +214,6 @@ clean: -if exist $(OBJS)\dbbrowse.ils del $(OBJS)\dbbrowse.ils $(OBJS)\dbbrowse.exe: $(DBBROWSE_OBJECTS) $(OBJS)\dbbrowse_dbbrowse.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(DBBROWSE_OBJECTS),$@,, $(__WXLIB_DBGRID_p) $(__WXLIB_ADV_p) $(__WXLIB_ODBC_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\dbbrowse_dbbrowse.res | diff --git a/demos/dbbrowse/makefile.gcc b/demos/dbbrowse/makefile.gcc index 49ece2a..a9d23a7 100644 --- a/demos/dbbrowse/makefile.gcc +++ b/demos/dbbrowse/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -DBBROWSE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +DBBROWSE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) DBBROWSE_OBJECTS = \ $(OBJS)\dbbrowse_dbbrowse.o \ $(OBJS)\dbbrowse_doc.o \ diff --git a/demos/dbbrowse/makefile.vc b/demos/dbbrowse/makefile.vc index f0b1641..d78983c 100644 --- a/demos/dbbrowse/makefile.vc +++ b/demos/dbbrowse/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -DBBROWSE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\dbbrowse.pdb $(____DEBUGRUNTIME_2_p) \ +DBBROWSE_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\dbbrowse.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) DBBROWSE_OBJECTS = \ $(OBJS)\dbbrowse_dbbrowse.obj \ $(OBJS)\dbbrowse_doc.obj \ diff --git a/demos/dbbrowse/makefile.wat b/demos/dbbrowse/makefile.wat index 300a194..4909093 100644 --- a/demos/dbbrowse/makefile.wat +++ b/demos/dbbrowse/makefile.wat @@ -186,10 +186,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -DBBROWSE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +DBBROWSE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) DBBROWSE_OBJECTS = & $(OBJS)\dbbrowse_dbbrowse.obj & $(OBJS)\dbbrowse_doc.obj & diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in index 2500fe7..de291b6 100644 --- a/demos/forty/Makefile.in +++ b/demos/forty/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -FORTY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +FORTY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) FORTY_OBJECTS = \ $(__forty_os2_lib_res) \ forty_forty.o \ @@ -85,8 +84,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o forty$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o forty$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -167,7 +166,7 @@ forty_forty.o: $(srcdir)/forty.cpp $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $< forty_forty_rc.o: $(srcdir)/forty.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples forty_game.o: $(srcdir)/game.cpp $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $< diff --git a/demos/forty/makefile.bcc b/demos/forty/makefile.bcc index 1b90969..590d341 100644 --- a/demos/forty/makefile.bcc +++ b/demos/forty/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -FORTY_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +FORTY_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) FORTY_OBJECTS = \ $(OBJS)\forty_forty.obj \ $(OBJS)\forty_canvas.obj \ @@ -202,6 +203,6 @@ clean: -if exist $(OBJS)\forty.ils del $(OBJS)\forty.ils $(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(FORTY_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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\forty_forty.res | diff --git a/demos/forty/makefile.gcc b/demos/forty/makefile.gcc index 61085bf..cf3d89a 100644 --- a/demos/forty/makefile.gcc +++ b/demos/forty/makefile.gcc @@ -12,11 +12,10 @@ include ../../build/msw/config.gcc ### Variables: ### -FORTY_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +FORTY_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) FORTY_OBJECTS = \ $(OBJS)\forty_forty.o \ $(OBJS)\forty_canvas.o \ diff --git a/demos/forty/makefile.vc b/demos/forty/makefile.vc index 1e6b43b..86c1987 100644 --- a/demos/forty/makefile.vc +++ b/demos/forty/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -FORTY_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +FORTY_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\forty.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) FORTY_OBJECTS = \ $(OBJS)\forty_forty.obj \ $(OBJS)\forty_canvas.obj \ diff --git a/demos/forty/makefile.wat b/demos/forty/makefile.wat index ba121fa..85f3763 100644 --- a/demos/forty/makefile.wat +++ b/demos/forty/makefile.wat @@ -172,10 +172,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -FORTY_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +FORTY_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) FORTY_OBJECTS = & $(OBJS)\forty_forty.obj & $(OBJS)\forty_canvas.obj & diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in index a276d39..5757c7b 100644 --- a/demos/fractal/Makefile.in +++ b/demos/fractal/Makefile.in @@ -35,9 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -FRACTAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +FRACTAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) FRACTAL_OBJECTS = \ $(__fractal_os2_lib_res) \ fractal_fractal.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o fractal$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o fractal$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -150,7 +149,7 @@ fractal_fractal.o: $(srcdir)/fractal.cpp $(CXXC) -c -o $@ $(FRACTAL_CXXFLAGS) $< fractal_fractal_rc.o: $(srcdir)/fractal.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all diff --git a/demos/fractal/makefile.bcc b/demos/fractal/makefile.bcc index bbac8cf..b8356be 100644 --- a/demos/fractal/makefile.bcc +++ b/demos/fractal/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -FRACTAL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +FRACTAL_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) FRACTAL_OBJECTS = \ $(OBJS)\fractal_fractal.obj OBJS = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\fractal.ils del $(OBJS)\fractal.ils $(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(FRACTAL_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\fractal_fractal.res | diff --git a/demos/fractal/makefile.gcc b/demos/fractal/makefile.gcc index 5012b18..8cdf169 100644 --- a/demos/fractal/makefile.gcc +++ b/demos/fractal/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -FRACTAL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +FRACTAL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) FRACTAL_OBJECTS = \ $(OBJS)\fractal_fractal.o \ $(OBJS)\fractal_fractal_rc.o diff --git a/demos/fractal/makefile.vc b/demos/fractal/makefile.vc index 9739af1..e4f526b 100644 --- a/demos/fractal/makefile.vc +++ b/demos/fractal/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -FRACTAL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\fractal.pdb $(____DEBUGRUNTIME_2_p) \ +FRACTAL_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\fractal.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) FRACTAL_OBJECTS = \ $(OBJS)\fractal_fractal.obj \ $(OBJS)\fractal_fractal.res diff --git a/demos/fractal/makefile.wat b/demos/fractal/makefile.wat index 72dc046..6d40b0a 100644 --- a/demos/fractal/makefile.wat +++ b/demos/fractal/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -FRACTAL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +FRACTAL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) FRACTAL_OBJECTS = & $(OBJS)\fractal_fractal.obj OBJS = & diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in index 33fe272..6954535 100644 --- a/demos/life/Makefile.in +++ b/demos/life/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -LIFE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +LIFE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) LIFE_OBJECTS = \ $(__life_os2_lib_res) \ life_life.o \ @@ -80,8 +79,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o life$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o life$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -171,7 +170,7 @@ life_life.o: $(srcdir)/life.cpp $(CXXC) -c -o $@ $(LIFE_CXXFLAGS) $< life_life_rc.o: $(srcdir)/life.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples life_reader.o: $(srcdir)/reader.cpp $(CXXC) -c -o $@ $(LIFE_CXXFLAGS) $< diff --git a/demos/life/makefile.bcc b/demos/life/makefile.bcc index 7d89b87..b9ef72c 100644 --- a/demos/life/makefile.bcc +++ b/demos/life/makefile.bcc @@ -7,6 +7,9 @@ .autodepend !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -16,10 +19,6 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### LIFE_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ diff --git a/demos/makefile.bcc b/demos/makefile.bcc index 424c7d9..84df654 100644 --- a/demos/makefile.bcc +++ b/demos/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,10 +19,6 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### MAKEARGS = -DCPPFLAGS="$(CPPFLAGS)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \ diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in index dee44d3..97dd8ae 100644 --- a/demos/poem/Makefile.in +++ b/demos/poem/Makefile.in @@ -37,9 +37,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WXPOEM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +WXPOEM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) WXPOEM_OBJECTS = \ $(__wxpoem_os2_lib_res) \ wxpoem_wxpoem.o \ @@ -78,8 +77,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o wxpoem$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o wxpoem$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -168,7 +167,7 @@ wxpoem_wxpoem.o: $(srcdir)/wxpoem.cpp $(CXXC) -c -o $@ $(WXPOEM_CXXFLAGS) $< wxpoem_wxpoem_rc.o: $(srcdir)/wxpoem.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples # Include dependency info, if present: diff --git a/demos/poem/makefile.bcc b/demos/poem/makefile.bcc index 6f68867..08451ea 100644 --- a/demos/poem/makefile.bcc +++ b/demos/poem/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,16 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXPOEM_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +WXPOEM_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) WXPOEM_OBJECTS = \ $(OBJS)\wxpoem_wxpoem.obj @@ -178,6 +179,6 @@ data: for %f in (wxpoem.txt wxpoem.dat) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(WXPOEM_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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\wxpoem_wxpoem.res | diff --git a/demos/poem/makefile.gcc b/demos/poem/makefile.gcc index 699ca05..afb0b91 100644 --- a/demos/poem/makefile.gcc +++ b/demos/poem/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXPOEM_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +WXPOEM_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) WXPOEM_OBJECTS = \ $(OBJS)\wxpoem_wxpoem.o \ $(OBJS)\wxpoem_wxpoem_rc.o diff --git a/demos/poem/makefile.vc b/demos/poem/makefile.vc index e027eb1..a0cc0d4 100644 --- a/demos/poem/makefile.vc +++ b/demos/poem/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXPOEM_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +WXPOEM_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\wxpoem.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) WXPOEM_OBJECTS = \ $(OBJS)\wxpoem_wxpoem.obj \ $(OBJS)\wxpoem_wxpoem.res diff --git a/demos/poem/makefile.wat b/demos/poem/makefile.wat index 02cf266..248a897 100644 --- a/demos/poem/makefile.wat +++ b/demos/poem/makefile.wat @@ -176,10 +176,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXPOEM_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +WXPOEM_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) WXPOEM_OBJECTS = & $(OBJS)\wxpoem_wxpoem.obj diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in index 1d72f8a..9de77bd 100644 --- a/samples/access/Makefile.in +++ b/samples/access/Makefile.in @@ -34,9 +34,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### -ACCESSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +ACCESSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) ACCESSTEST_OBJECTS = \ $(__accesstest_os2_lib_res) \ accesstest_accesstest.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o accesstest$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o accesstest$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -139,7 +138,7 @@ accesstest_accesstest.o: $(srcdir)/accesstest.cpp $(CXXC) -c -o $@ $(ACCESSTEST_CXXFLAGS) $< accesstest_accesstest_rc.o: $(srcdir)/accesstest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples @COND_PLATFORM_MACOSX_1@accesstest_bundle: accesstest.app/Contents/PkgInfo diff --git a/samples/access/makefile.bcc b/samples/access/makefile.bcc index 2fb03ba..1498740 100644 --- a/samples/access/makefile.bcc +++ b/samples/access/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -ACCESSTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +ACCESSTEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) ACCESSTEST_OBJECTS = \ $(OBJS)\accesstest_accesstest.obj OBJS = \ @@ -160,7 +161,7 @@ $(OBJS)\accesstest_accesstest.res: .\accesstest.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $** $(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| 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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\accesstest_accesstest.res | diff --git a/samples/access/makefile.gcc b/samples/access/makefile.gcc index 8d2798b..473ab75 100644 --- a/samples/access/makefile.gcc +++ b/samples/access/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -ACCESSTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +ACCESSTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) ACCESSTEST_OBJECTS = \ $(OBJS)\accesstest_accesstest.o \ $(OBJS)\accesstest_accesstest_rc.o diff --git a/samples/access/makefile.vc b/samples/access/makefile.vc index 3bac376..314e307 100644 --- a/samples/access/makefile.vc +++ b/samples/access/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -ACCESSTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\accesstest.pdb $(____DEBUGRUNTIME_2_p) \ +ACCESSTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\accesstest.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) ACCESSTEST_OBJECTS = \ $(OBJS)\accesstest_accesstest.obj \ $(OBJS)\accesstest_accesstest.res diff --git a/samples/access/makefile.wat b/samples/access/makefile.wat index bdf52e6..e1bf5d7 100644 --- a/samples/access/makefile.wat +++ b/samples/access/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -ACCESSTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +ACCESSTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) ACCESSTEST_OBJECTS = & $(OBJS)\accesstest_accesstest.obj OBJS = & diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in index 88b7e7b..83a995f 100644 --- a/samples/artprov/Makefile.in +++ b/samples/artprov/Makefile.in @@ -34,9 +34,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### -ARTTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +ARTTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) ARTTEST_OBJECTS = \ $(__arttest_os2_lib_res) \ arttest_arttest.o \ @@ -78,8 +77,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o arttest$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o arttest$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -143,7 +142,7 @@ arttest_arttest.o: $(srcdir)/arttest.cpp $(CXXC) -c -o $@ $(ARTTEST_CXXFLAGS) $< arttest_arttest_rc.o: $(srcdir)/arttest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples @COND_PLATFORM_MACOSX_1@arttest_bundle: arttest.app/Contents/PkgInfo diff --git a/samples/artprov/makefile.bcc b/samples/artprov/makefile.bcc index e0574c2..10db4f8 100644 --- a/samples/artprov/makefile.bcc +++ b/samples/artprov/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -ARTTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +ARTTEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) ARTTEST_OBJECTS = \ $(OBJS)\arttest_arttest.obj \ $(OBJS)\arttest_artbrows.obj @@ -164,7 +165,7 @@ $(OBJS)\arttest_arttest.res: .\arttest.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $** $(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| 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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\arttest_arttest.res | diff --git a/samples/artprov/makefile.gcc b/samples/artprov/makefile.gcc index ad2b730..98304f6 100644 --- a/samples/artprov/makefile.gcc +++ b/samples/artprov/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -ARTTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +ARTTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) ARTTEST_OBJECTS = \ $(OBJS)\arttest_arttest.o \ $(OBJS)\arttest_artbrows.o \ diff --git a/samples/artprov/makefile.vc b/samples/artprov/makefile.vc index f0ea3a3..dc3a654 100644 --- a/samples/artprov/makefile.vc +++ b/samples/artprov/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -ARTTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\arttest.pdb $(____DEBUGRUNTIME_2_p) \ +ARTTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\arttest.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) ARTTEST_OBJECTS = \ $(OBJS)\arttest_arttest.obj \ $(OBJS)\arttest_artbrows.obj \ diff --git a/samples/artprov/makefile.wat b/samples/artprov/makefile.wat index 6f469f7..163111a 100644 --- a/samples/artprov/makefile.wat +++ b/samples/artprov/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -ARTTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +ARTTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) ARTTEST_OBJECTS = & $(OBJS)\arttest_arttest.obj & $(OBJS)\arttest_artbrows.obj diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in index 8503a69..6fb6c30 100644 --- a/samples/calendar/Makefile.in +++ b/samples/calendar/Makefile.in @@ -34,9 +34,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CALENDAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +CALENDAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) CALENDAR_OBJECTS = \ $(__calendar_os2_lib_res) \ calendar_calendar.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o calendar$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o calendar$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ @@ -144,7 +143,7 @@ calendar_calendar.o: $(srcdir)/calendar.cpp $(CXXC) -c -o $@ $(CALENDAR_CXXFLAGS) $< calendar_calendar_rc.o: $(srcdir)/calendar.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples clean: rm -rf ./.deps ./.pch diff --git a/samples/calendar/makefile.bcc b/samples/calendar/makefile.bcc index a19f69b..0e4ae8d 100644 --- a/samples/calendar/makefile.bcc +++ b/samples/calendar/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -CALENDAR_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +CALENDAR_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) CALENDAR_OBJECTS = \ $(OBJS)\calendar_calendar.obj OBJS = \ @@ -164,7 +165,7 @@ $(OBJS)\calendar_calendar.res: .\calendar.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $** $(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| 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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\calendar_calendar.res | diff --git a/samples/calendar/makefile.gcc b/samples/calendar/makefile.gcc index c1dd6d7..74a8e47 100644 --- a/samples/calendar/makefile.gcc +++ b/samples/calendar/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -CALENDAR_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +CALENDAR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) CALENDAR_OBJECTS = \ $(OBJS)\calendar_calendar.o \ $(OBJS)\calendar_calendar_rc.o diff --git a/samples/calendar/makefile.vc b/samples/calendar/makefile.vc index cc751a6..0532dcb 100644 --- a/samples/calendar/makefile.vc +++ b/samples/calendar/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -CALENDAR_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\calendar.pdb $(____DEBUGRUNTIME_2_p) \ +CALENDAR_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\calendar.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) CALENDAR_OBJECTS = \ $(OBJS)\calendar_calendar.obj \ $(OBJS)\calendar_calendar.res diff --git a/samples/calendar/makefile.wat b/samples/calendar/makefile.wat index 041fc70..b9bd12d 100644 --- a/samples/calendar/makefile.wat +++ b/samples/calendar/makefile.wat @@ -172,10 +172,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -CALENDAR_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +CALENDAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) CALENDAR_OBJECTS = & $(OBJS)\calendar_calendar.obj OBJS = & diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in index 5bdf6e9..bd6e79d 100644 --- a/samples/caret/Makefile.in +++ b/samples/caret/Makefile.in @@ -34,9 +34,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CARET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +CARET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) CARET_OBJECTS = \ $(__caret_os2_lib_res) \ caret_caret.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o caret$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o caret$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -141,7 +140,7 @@ caret_caret.o: $(srcdir)/caret.cpp $(CXXC) -c -o $@ $(CARET_CXXFLAGS) $< caret_caret_rc.o: $(srcdir)/caret.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples clean: rm -rf ./.deps ./.pch diff --git a/samples/caret/makefile.bcc b/samples/caret/makefile.bcc index ce78c22..5e44f79 100644 --- a/samples/caret/makefile.bcc +++ b/samples/caret/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -CARET_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +CARET_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) CARET_OBJECTS = \ $(OBJS)\caret_caret.obj OBJS = \ @@ -160,7 +161,7 @@ $(OBJS)\caret_caret.res: .\caret.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $** $(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_caret.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| 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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\caret_caret.res | diff --git a/samples/caret/makefile.gcc b/samples/caret/makefile.gcc index 7a2f018..006b499 100644 --- a/samples/caret/makefile.gcc +++ b/samples/caret/makefile.gcc @@ -12,11 +12,10 @@ include ../../build/msw/config.gcc ### Variables: ### -CARET_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +CARET_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) CARET_OBJECTS = \ $(OBJS)\caret_caret.o \ $(OBJS)\caret_caret_rc.o diff --git a/samples/caret/makefile.vc b/samples/caret/makefile.vc index 7d9c51f..e60c9f2 100644 --- a/samples/caret/makefile.vc +++ b/samples/caret/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -CARET_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +CARET_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\caret.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) CARET_OBJECTS = \ $(OBJS)\caret_caret.obj \ $(OBJS)\caret_caret.res diff --git a/samples/caret/makefile.wat b/samples/caret/makefile.wat index 24b67a4..f6c1143 100644 --- a/samples/caret/makefile.wat +++ b/samples/caret/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -CARET_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +CARET_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) CARET_OBJECTS = & $(OBJS)\caret_caret.obj OBJS = & diff --git a/samples/checklst/Makefile.in b/samples/checklst/Makefile.in index 96e66b4..136c50f 100644 --- a/samples/checklst/Makefile.in +++ b/samples/checklst/Makefile.in @@ -34,9 +34,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CHECKLST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +CHECKLST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) CHECKLST_OBJECTS = \ $(__checklst_os2_lib_res) \ checklst_checklst.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o checklst$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o checklst$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -141,7 +140,7 @@ checklst_checklst.o: $(srcdir)/checklst.cpp $(CXXC) -c -o $@ $(CHECKLST_CXXFLAGS) $< checklst_checklst_rc.o: $(srcdir)/checklst.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples clean: rm -rf ./.deps ./.pch diff --git a/samples/checklst/makefile.bcc b/samples/checklst/makefile.bcc index 8be99e8..551f289 100644 --- a/samples/checklst/makefile.bcc +++ b/samples/checklst/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -CHECKLST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +CHECKLST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) CHECKLST_OBJECTS = \ $(OBJS)\checklst_checklst.obj OBJS = \ @@ -160,7 +161,7 @@ $(OBJS)\checklst_checklst.res: .\checklst.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $** $(OBJS)\checklst.exe: $(CHECKLST_OBJECTS) $(OBJS)\checklst_checklst.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(CHECKLST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\checklst_checklst.res | diff --git a/samples/checklst/makefile.gcc b/samples/checklst/makefile.gcc index 29cf44d..2da557b 100644 --- a/samples/checklst/makefile.gcc +++ b/samples/checklst/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -CHECKLST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +CHECKLST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) CHECKLST_OBJECTS = \ $(OBJS)\checklst_checklst.o \ $(OBJS)\checklst_checklst_rc.o diff --git a/samples/checklst/makefile.vc b/samples/checklst/makefile.vc index 34f6d97..3de3743 100644 --- a/samples/checklst/makefile.vc +++ b/samples/checklst/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -CHECKLST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\checklst.pdb $(____DEBUGRUNTIME_2_p) \ +CHECKLST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\checklst.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) CHECKLST_OBJECTS = \ $(OBJS)\checklst_checklst.obj \ $(OBJS)\checklst_checklst.res diff --git a/samples/checklst/makefile.wat b/samples/checklst/makefile.wat index e79aeac..17ae746 100644 --- a/samples/checklst/makefile.wat +++ b/samples/checklst/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -CHECKLST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +CHECKLST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) CHECKLST_OBJECTS = & $(OBJS)\checklst_checklst.obj OBJS = & diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in index 1ef9114..4574296 100644 --- a/samples/config/Makefile.in +++ b/samples/config/Makefile.in @@ -34,9 +34,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CONFTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +CONFTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) CONFTEST_OBJECTS = \ $(__conftest_os2_lib_res) \ conftest_conftest.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o conftest$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o conftest$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -147,7 +146,7 @@ conftest_conftest.o: $(srcdir)/conftest.cpp $(CXXC) -c -o $@ $(CONFTEST_CXXFLAGS) $< conftest_conftest_rc.o: $(srcdir)/conftest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile diff --git a/samples/config/makefile.bcc b/samples/config/makefile.bcc index edb6bdf..267bb89 100644 --- a/samples/config/makefile.bcc +++ b/samples/config/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -CONFTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +CONFTEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) CONFTEST_OBJECTS = \ $(OBJS)\conftest_conftest.obj OBJS = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\conftest.ils del $(OBJS)\conftest.ils $(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| 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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\conftest_conftest.res | diff --git a/samples/config/makefile.gcc b/samples/config/makefile.gcc index b58d99d..b9d30b7 100644 --- a/samples/config/makefile.gcc +++ b/samples/config/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -CONFTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +CONFTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) CONFTEST_OBJECTS = \ $(OBJS)\conftest_conftest.o \ $(OBJS)\conftest_conftest_rc.o diff --git a/samples/config/makefile.vc b/samples/config/makefile.vc index aa95666..6a7ad7c 100644 --- a/samples/config/makefile.vc +++ b/samples/config/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -CONFTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\conftest.pdb $(____DEBUGRUNTIME_2_p) \ +CONFTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\conftest.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) CONFTEST_OBJECTS = \ $(OBJS)\conftest_conftest.obj \ $(OBJS)\conftest_conftest.res diff --git a/samples/config/makefile.wat b/samples/config/makefile.wat index c1ac1e9..573ae6c 100644 --- a/samples/config/makefile.wat +++ b/samples/config/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -CONFTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +CONFTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) CONFTEST_OBJECTS = & $(OBJS)\conftest_conftest.obj OBJS = & diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in index 588bb69..152ee47 100644 --- a/samples/console/Makefile.in +++ b/samples/console/Makefile.in @@ -29,8 +29,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CONSOLE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS) +CONSOLE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS) CONSOLE_OBJECTS = \ console_console.o DESTDIR = diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in index e9c4f23..4082baf 100644 --- a/samples/controls/Makefile.in +++ b/samples/controls/Makefile.in @@ -34,9 +34,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CONTROLS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +CONTROLS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) CONTROLS_OBJECTS = \ $(__controls_os2_lib_res) \ controls_controls.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o controls$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o controls$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -147,7 +146,7 @@ controls_controls.o: $(srcdir)/controls.cpp $(CXXC) -c -o $@ $(CONTROLS_CXXFLAGS) $< controls_controls_rc.o: $(srcdir)/controls.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples data: @mkdir -p . diff --git a/samples/controls/makefile.bcc b/samples/controls/makefile.bcc index 706ab89..4816572 100644 --- a/samples/controls/makefile.bcc +++ b/samples/controls/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -CONTROLS_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +CONTROLS_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) CONTROLS_OBJECTS = \ $(OBJS)\controls_controls.obj OBJS = \ @@ -170,7 +171,7 @@ clean: -if exist $(OBJS)\controls.ils del $(OBJS)\controls.ils $(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(CONTROLS_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\controls_controls.res | diff --git a/samples/controls/makefile.gcc b/samples/controls/makefile.gcc index df52971..eecdbf9 100644 --- a/samples/controls/makefile.gcc +++ b/samples/controls/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -CONTROLS_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +CONTROLS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) CONTROLS_OBJECTS = \ $(OBJS)\controls_controls.o \ $(OBJS)\controls_controls_rc.o diff --git a/samples/controls/makefile.vc b/samples/controls/makefile.vc index e85d2d7..a6ad012 100644 --- a/samples/controls/makefile.vc +++ b/samples/controls/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -CONTROLS_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\controls.pdb $(____DEBUGRUNTIME_2_p) \ +CONTROLS_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\controls.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) CONTROLS_OBJECTS = \ $(OBJS)\controls_controls.obj \ $(OBJS)\controls_controls.res diff --git a/samples/controls/makefile.wat b/samples/controls/makefile.wat index 4cd8efe..28b4faf 100644 --- a/samples/controls/makefile.wat +++ b/samples/controls/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -CONTROLS_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +CONTROLS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) CONTROLS_OBJECTS = & $(OBJS)\controls_controls.obj OBJS = & diff --git a/samples/db/Makefile.in b/samples/db/Makefile.in index 2c109b9..472d20d 100644 --- a/samples/db/Makefile.in +++ b/samples/db/Makefile.in @@ -35,9 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### -DBTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +DBTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) DBTEST_OBJECTS = \ $(__dbtest_os2_lib_res) \ dbtest_dbtest.o \ @@ -79,8 +78,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o dbtest$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o dbtest$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -153,7 +152,7 @@ dbtest_dbtest.o: $(srcdir)/dbtest.cpp $(CXXC) -c -o $@ $(DBTEST_CXXFLAGS) $< dbtest_dbtest_rc.o: $(srcdir)/dbtest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples dbtest_listdb.o: $(srcdir)/listdb.cpp $(CXXC) -c -o $@ $(DBTEST_CXXFLAGS) $< diff --git a/samples/db/makefile.bcc b/samples/db/makefile.bcc index 57b0c9f..4a44886 100644 --- a/samples/db/makefile.bcc +++ b/samples/db/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -DBTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +DBTEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) DBTEST_OBJECTS = \ $(OBJS)\dbtest_dbtest.obj \ $(OBJS)\dbtest_listdb.obj @@ -181,7 +182,7 @@ clean: !if "$(USE_ODBC)" == "1" $(OBJS)\dbtest.exe: $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(DBTEST_OBJECTS),$@,, $(__WXLIB_ODBC_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\dbtest_dbtest.res | !endif diff --git a/samples/db/makefile.gcc b/samples/db/makefile.gcc index 06458a4..9a44d22 100644 --- a/samples/db/makefile.gcc +++ b/samples/db/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -DBTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +DBTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) DBTEST_OBJECTS = \ $(OBJS)\dbtest_dbtest.o \ $(OBJS)\dbtest_listdb.o \ diff --git a/samples/db/makefile.vc b/samples/db/makefile.vc index 382cbb7..6071384 100644 --- a/samples/db/makefile.vc +++ b/samples/db/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -DBTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +DBTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\dbtest.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) DBTEST_OBJECTS = \ $(OBJS)\dbtest_dbtest.obj \ $(OBJS)\dbtest_listdb.obj \ diff --git a/samples/db/makefile.wat b/samples/db/makefile.wat index efcb225..66930ae 100644 --- a/samples/db/makefile.wat +++ b/samples/db/makefile.wat @@ -175,10 +175,10 @@ __dbtest___depname = $(OBJS)\dbtest.exe ### Variables: ### -DBTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +DBTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) DBTEST_OBJECTS = & $(OBJS)\dbtest_dbtest.obj & $(OBJS)\dbtest_listdb.obj diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in index 01011a2..fd69486 100644 --- a/samples/dialogs/Makefile.in +++ b/samples/dialogs/Makefile.in @@ -35,9 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -DIALOGS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +DIALOGS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) DIALOGS_OBJECTS = \ $(__dialogs_os2_lib_res) \ dialogs_dialogs.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o dialogs$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o dialogs$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ @@ -158,7 +157,7 @@ dialogs_dialogs.o: $(srcdir)/dialogs.cpp $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $< dialogs_dialogs_rc.o: $(srcdir)/dialogs.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile diff --git a/samples/dialogs/makefile.bcc b/samples/dialogs/makefile.bcc index b1e693a..5fbaf3b 100644 --- a/samples/dialogs/makefile.bcc +++ b/samples/dialogs/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -DIALOGS_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +DIALOGS_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) DIALOGS_OBJECTS = \ $(OBJS)\dialogs_dialogs.obj OBJS = \ @@ -178,6 +179,6 @@ data: for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| 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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\dialogs_dialogs.res | diff --git a/samples/dialogs/makefile.gcc b/samples/dialogs/makefile.gcc index dc0cb7c..17a4ebe 100644 --- a/samples/dialogs/makefile.gcc +++ b/samples/dialogs/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -DIALOGS_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +DIALOGS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) DIALOGS_OBJECTS = \ $(OBJS)\dialogs_dialogs.o \ $(OBJS)\dialogs_dialogs_rc.o diff --git a/samples/dialogs/makefile.vc b/samples/dialogs/makefile.vc index 6035906..3e489d3 100644 --- a/samples/dialogs/makefile.vc +++ b/samples/dialogs/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -DIALOGS_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\dialogs.pdb $(____DEBUGRUNTIME_2_p) \ +DIALOGS_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\dialogs.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) DIALOGS_OBJECTS = \ $(OBJS)\dialogs_dialogs.obj \ $(OBJS)\dialogs_dialogs.res diff --git a/samples/dialogs/makefile.wat b/samples/dialogs/makefile.wat index b0d0596..b988ed5 100644 --- a/samples/dialogs/makefile.wat +++ b/samples/dialogs/makefile.wat @@ -172,10 +172,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -DIALOGS_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +DIALOGS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) DIALOGS_OBJECTS = & $(OBJS)\dialogs_dialogs.obj OBJS = & diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in index 3281242..50da330 100644 --- a/samples/dialup/Makefile.in +++ b/samples/dialup/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -NETTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +NETTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) NETTEST_OBJECTS = \ $(__nettest_os2_lib_res) \ nettest_nettest.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o nettest$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o nettest$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ nettest_nettest.o: $(srcdir)/nettest.cpp $(CXXC) -c -o $@ $(NETTEST_CXXFLAGS) $< nettest_nettest_rc.o: $(srcdir)/nettest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/dialup/makefile.bcc b/samples/dialup/makefile.bcc index 217ca64..3874492 100644 --- a/samples/dialup/makefile.bcc +++ b/samples/dialup/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -NETTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +NETTEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) NETTEST_OBJECTS = \ $(OBJS)\nettest_nettest.obj OBJS = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\nettest.ils del $(OBJS)\nettest.ils $(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| 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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\nettest_nettest.res | diff --git a/samples/dialup/makefile.gcc b/samples/dialup/makefile.gcc index 9876911..8f14b6f 100644 --- a/samples/dialup/makefile.gcc +++ b/samples/dialup/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -NETTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +NETTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) NETTEST_OBJECTS = \ $(OBJS)\nettest_nettest.o \ $(OBJS)\nettest_nettest_rc.o diff --git a/samples/dialup/makefile.vc b/samples/dialup/makefile.vc index 4bac169..2bc16e0 100644 --- a/samples/dialup/makefile.vc +++ b/samples/dialup/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -NETTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\nettest.pdb $(____DEBUGRUNTIME_2_p) \ +NETTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\nettest.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) NETTEST_OBJECTS = \ $(OBJS)\nettest_nettest.obj \ $(OBJS)\nettest_nettest.res diff --git a/samples/dialup/makefile.wat b/samples/dialup/makefile.wat index f5e2469..b66f87b 100644 --- a/samples/dialup/makefile.wat +++ b/samples/dialup/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -NETTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +NETTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) NETTEST_OBJECTS = & $(OBJS)\nettest_nettest.obj OBJS = & diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in index dedf50d..618ea03 100644 --- a/samples/display/Makefile.in +++ b/samples/display/Makefile.in @@ -35,9 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -DISPLAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +DISPLAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) DISPLAY_OBJECTS = \ $(__display___win32rc) \ $(__display_os2_lib_res) \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o display$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o display$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -147,7 +146,7 @@ display_display.o: $(srcdir)/display.cpp $(CXXC) -c -o $@ $(DISPLAY_CXXFLAGS) $< display_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile diff --git a/samples/display/makefile.bcc b/samples/display/makefile.bcc index f9b1c62..8d18516 100644 --- a/samples/display/makefile.bcc +++ b/samples/display/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -DISPLAY_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +DISPLAY_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) DISPLAY_OBJECTS = \ $(OBJS)\display_display.obj OBJS = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\display.ils del $(OBJS)\display.ils $(OBJS)\display.exe: $(DISPLAY_OBJECTS) $(OBJS)\display_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(DISPLAY_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\display_sample.res | diff --git a/samples/display/makefile.gcc b/samples/display/makefile.gcc index de15207..81228c8 100644 --- a/samples/display/makefile.gcc +++ b/samples/display/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -DISPLAY_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +DISPLAY_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) DISPLAY_OBJECTS = \ $(OBJS)\display_sample_rc.o \ $(OBJS)\display_display.o diff --git a/samples/display/makefile.vc b/samples/display/makefile.vc index febbede..c9a9689 100644 --- a/samples/display/makefile.vc +++ b/samples/display/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -DISPLAY_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\display.pdb $(____DEBUGRUNTIME_2_p) \ +DISPLAY_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\display.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) DISPLAY_OBJECTS = \ $(OBJS)\display_sample.res \ $(OBJS)\display_display.obj diff --git a/samples/display/makefile.wat b/samples/display/makefile.wat index 507ded6..3fec119 100644 --- a/samples/display/makefile.wat +++ b/samples/display/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -DISPLAY_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +DISPLAY_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) DISPLAY_OBJECTS = & $(OBJS)\display_display.obj OBJS = & diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in index d6e55d5..3537f1d 100644 --- a/samples/dnd/Makefile.in +++ b/samples/dnd/Makefile.in @@ -35,8 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -DND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \ - -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +DND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) DND_OBJECTS = \ $(__dnd_os2_lib_res) \ dnd_dnd.o \ @@ -76,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o dnd$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o dnd$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -156,7 +156,7 @@ dnd_dnd.o: $(srcdir)/dnd.cpp $(CXXC) -c -o $@ $(DND_CXXFLAGS) $< dnd_dnd_rc.o: $(srcdir)/dnd.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all diff --git a/samples/dnd/makefile.bcc b/samples/dnd/makefile.bcc index b63848e..d2d8cb1 100644 --- a/samples/dnd/makefile.bcc +++ b/samples/dnd/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -DND_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +DND_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) DND_OBJECTS = \ $(OBJS)\dnd_dnd.obj OBJS = \ @@ -174,6 +175,6 @@ data: for %f in (wxwin.png dnd.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\dnd.exe: $(DND_OBJECTS) $(OBJS)\dnd_dnd.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(DND_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\dnd_dnd.res | diff --git a/samples/dnd/makefile.gcc b/samples/dnd/makefile.gcc index d834869..1c81b89 100644 --- a/samples/dnd/makefile.gcc +++ b/samples/dnd/makefile.gcc @@ -12,11 +12,10 @@ include ../../build/msw/config.gcc ### Variables: ### -DND_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +DND_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) DND_OBJECTS = \ $(OBJS)\dnd_dnd.o \ $(OBJS)\dnd_dnd_rc.o diff --git a/samples/dnd/makefile.vc b/samples/dnd/makefile.vc index 2c5dc92..e159878 100644 --- a/samples/dnd/makefile.vc +++ b/samples/dnd/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -DND_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +DND_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\dnd.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) DND_OBJECTS = \ $(OBJS)\dnd_dnd.obj \ $(OBJS)\dnd_dnd.res diff --git a/samples/dnd/makefile.wat b/samples/dnd/makefile.wat index 2e3be38..e941902 100644 --- a/samples/dnd/makefile.wat +++ b/samples/dnd/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -DND_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +DND_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) DND_OBJECTS = & $(OBJS)\dnd_dnd.obj OBJS = & diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in index f131342..dcac89b 100644 --- a/samples/docview/Makefile.in +++ b/samples/docview/Makefile.in @@ -35,9 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -DOCVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +DOCVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) DOCVIEW_OBJECTS = \ $(__docview_os2_lib_res) \ docview_docview.o \ @@ -92,9 +91,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ COND_PLATFORM_MAC_1___docview___mac_rezcmd = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o docview$(EXEEXT) \ - $(MACOSX_RESOURCES) chart.r doc.r docview.r mondrian.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o docview$(EXEEXT) $(MACOSX_RESOURCES) chart.r doc.r \ + docview.r mondrian.r @COND_PLATFORM_MAC_1@__docview___mac_rezcmd = $(COND_PLATFORM_MAC_1___docview___mac_rezcmd) @COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C docview$(EXEEXT) @@ -156,7 +155,7 @@ docview_docview.o: $(srcdir)/docview.cpp $(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $< docview_docview_rc.o: $(srcdir)/docview.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples docview_view.o: $(srcdir)/view.cpp $(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $< diff --git a/samples/docview/makefile.bcc b/samples/docview/makefile.bcc index ad77c8c..6620a37 100644 --- a/samples/docview/makefile.bcc +++ b/samples/docview/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -DOCVIEW_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +DOCVIEW_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) DOCVIEW_OBJECTS = \ $(OBJS)\docview_docview.obj \ $(OBJS)\docview_doc.obj \ @@ -178,6 +179,6 @@ clean: -if exist $(OBJS)\docview.ils del $(OBJS)\docview.ils $(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(DOCVIEW_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\docview_docview.res | diff --git a/samples/docview/makefile.gcc b/samples/docview/makefile.gcc index d5469e2..69bda58 100644 --- a/samples/docview/makefile.gcc +++ b/samples/docview/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -DOCVIEW_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +DOCVIEW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) DOCVIEW_OBJECTS = \ $(OBJS)\docview_docview.o \ $(OBJS)\docview_doc.o \ diff --git a/samples/docview/makefile.vc b/samples/docview/makefile.vc index 53bedb5..b71ad65 100644 --- a/samples/docview/makefile.vc +++ b/samples/docview/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -DOCVIEW_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\docview.pdb $(____DEBUGRUNTIME_2_p) \ +DOCVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\docview.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) DOCVIEW_OBJECTS = \ $(OBJS)\docview_docview.obj \ $(OBJS)\docview_doc.obj \ diff --git a/samples/docview/makefile.wat b/samples/docview/makefile.wat index 616ea9d..a925cbd 100644 --- a/samples/docview/makefile.wat +++ b/samples/docview/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -DOCVIEW_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +DOCVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) DOCVIEW_OBJECTS = & $(OBJS)\docview_docview.obj & $(OBJS)\docview_doc.obj & diff --git a/samples/docvwmdi/Makefile.in b/samples/docvwmdi/Makefile.in index 6e9fc637..23819dc 100644 --- a/samples/docvwmdi/Makefile.in +++ b/samples/docvwmdi/Makefile.in @@ -35,9 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -DOCVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +DOCVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) DOCVIEW_OBJECTS = \ $(__docview_os2_lib_res) \ docview_docview.o \ @@ -79,8 +78,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o docview$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o docview$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -155,7 +154,7 @@ docview_docview.o: $(srcdir)/docview.cpp $(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $< docview_docview_rc.o: $(srcdir)/docview.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples docview_view.o: $(srcdir)/view.cpp $(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $< diff --git a/samples/docvwmdi/makefile.bcc b/samples/docvwmdi/makefile.bcc index ad77c8c..6620a37 100644 --- a/samples/docvwmdi/makefile.bcc +++ b/samples/docvwmdi/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -DOCVIEW_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +DOCVIEW_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) DOCVIEW_OBJECTS = \ $(OBJS)\docview_docview.obj \ $(OBJS)\docview_doc.obj \ @@ -178,6 +179,6 @@ clean: -if exist $(OBJS)\docview.ils del $(OBJS)\docview.ils $(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(DOCVIEW_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\docview_docview.res | diff --git a/samples/docvwmdi/makefile.gcc b/samples/docvwmdi/makefile.gcc index d5469e2..69bda58 100644 --- a/samples/docvwmdi/makefile.gcc +++ b/samples/docvwmdi/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -DOCVIEW_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +DOCVIEW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) DOCVIEW_OBJECTS = \ $(OBJS)\docview_docview.o \ $(OBJS)\docview_doc.o \ diff --git a/samples/docvwmdi/makefile.vc b/samples/docvwmdi/makefile.vc index 53bedb5..b71ad65 100644 --- a/samples/docvwmdi/makefile.vc +++ b/samples/docvwmdi/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -DOCVIEW_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\docview.pdb $(____DEBUGRUNTIME_2_p) \ +DOCVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\docview.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) DOCVIEW_OBJECTS = \ $(OBJS)\docview_docview.obj \ $(OBJS)\docview_doc.obj \ diff --git a/samples/docvwmdi/makefile.wat b/samples/docvwmdi/makefile.wat index 616ea9d..a925cbd 100644 --- a/samples/docvwmdi/makefile.wat +++ b/samples/docvwmdi/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -DOCVIEW_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +DOCVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) DOCVIEW_OBJECTS = & $(OBJS)\docview_docview.obj & $(OBJS)\docview_doc.obj & diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in index 699a96b..7af37ca 100644 --- a/samples/dragimag/Makefile.in +++ b/samples/dragimag/Makefile.in @@ -35,9 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -DRAGIMAG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +DRAGIMAG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) DRAGIMAG_OBJECTS = \ $(__dragimag_os2_lib_res) \ dragimag_dragimag.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o dragimag$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o dragimag$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -158,7 +157,7 @@ dragimag_dragimag.o: $(srcdir)/dragimag.cpp $(CXXC) -c -o $@ $(DRAGIMAG_CXXFLAGS) $< dragimag_dragimag_rc.o: $(srcdir)/dragimag.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all diff --git a/samples/dragimag/makefile.bcc b/samples/dragimag/makefile.bcc index ad67d6a..2e4023e 100644 --- a/samples/dragimag/makefile.bcc +++ b/samples/dragimag/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -DRAGIMAG_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +DRAGIMAG_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) DRAGIMAG_OBJECTS = \ $(OBJS)\dragimag_dragimag.obj OBJS = \ @@ -174,6 +175,6 @@ data: for %f in (backgrnd.png shape01.png shape02.png shape03.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\dragimag.exe: $(DRAGIMAG_OBJECTS) $(OBJS)\dragimag_dragimag.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(DRAGIMAG_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\dragimag_dragimag.res | diff --git a/samples/dragimag/makefile.gcc b/samples/dragimag/makefile.gcc index df2c0d8..fc1ec7d 100644 --- a/samples/dragimag/makefile.gcc +++ b/samples/dragimag/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -DRAGIMAG_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +DRAGIMAG_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) DRAGIMAG_OBJECTS = \ $(OBJS)\dragimag_dragimag.o \ $(OBJS)\dragimag_dragimag_rc.o diff --git a/samples/dragimag/makefile.vc b/samples/dragimag/makefile.vc index 169b564..5885ea0 100644 --- a/samples/dragimag/makefile.vc +++ b/samples/dragimag/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -DRAGIMAG_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\dragimag.pdb $(____DEBUGRUNTIME_2_p) \ +DRAGIMAG_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\dragimag.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) DRAGIMAG_OBJECTS = \ $(OBJS)\dragimag_dragimag.obj \ $(OBJS)\dragimag_dragimag.res diff --git a/samples/dragimag/makefile.wat b/samples/dragimag/makefile.wat index 5cfff4f..5dfceef 100644 --- a/samples/dragimag/makefile.wat +++ b/samples/dragimag/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -DRAGIMAG_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +DRAGIMAG_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) DRAGIMAG_OBJECTS = & $(OBJS)\dragimag_dragimag.obj OBJS = & diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in index ed5371c..500aab2 100644 --- a/samples/drawing/Makefile.in +++ b/samples/drawing/Makefile.in @@ -35,9 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -DRAWING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +DRAWING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) DRAWING_OBJECTS = \ $(__drawing_os2_lib_res) \ drawing_drawing.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o drawing$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o drawing$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -158,7 +157,7 @@ drawing_drawing.o: $(srcdir)/drawing.cpp $(CXXC) -c -o $@ $(DRAWING_CXXFLAGS) $< drawing_drawing_rc.o: $(srcdir)/drawing.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all diff --git a/samples/drawing/makefile.bcc b/samples/drawing/makefile.bcc index 60c46f2..e5486d8 100644 --- a/samples/drawing/makefile.bcc +++ b/samples/drawing/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -DRAWING_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +DRAWING_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) DRAWING_OBJECTS = \ $(OBJS)\drawing_drawing.obj OBJS = \ @@ -174,6 +175,6 @@ data: for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| 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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\drawing_drawing.res | diff --git a/samples/drawing/makefile.gcc b/samples/drawing/makefile.gcc index 09fc1b1..ffe0b06 100644 --- a/samples/drawing/makefile.gcc +++ b/samples/drawing/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -DRAWING_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +DRAWING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) DRAWING_OBJECTS = \ $(OBJS)\drawing_drawing.o \ $(OBJS)\drawing_drawing_rc.o diff --git a/samples/drawing/makefile.vc b/samples/drawing/makefile.vc index f2a2be4..84b0591 100644 --- a/samples/drawing/makefile.vc +++ b/samples/drawing/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -DRAWING_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\drawing.pdb $(____DEBUGRUNTIME_2_p) \ +DRAWING_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\drawing.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) DRAWING_OBJECTS = \ $(OBJS)\drawing_drawing.obj \ $(OBJS)\drawing_drawing.res diff --git a/samples/drawing/makefile.wat b/samples/drawing/makefile.wat index ab2671e..46d1cda 100644 --- a/samples/drawing/makefile.wat +++ b/samples/drawing/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -DRAWING_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +DRAWING_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) DRAWING_OBJECTS = & $(OBJS)\drawing_drawing.obj OBJS = & diff --git a/samples/dynamic/Makefile.in b/samples/dynamic/Makefile.in index 7241d46..c30ec44 100644 --- a/samples/dynamic/Makefile.in +++ b/samples/dynamic/Makefile.in @@ -35,9 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -DYNAMIC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +DYNAMIC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) DYNAMIC_OBJECTS = \ $(__dynamic_os2_lib_res) \ dynamic_dynamic.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o dynamic$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o dynamic$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -150,7 +149,7 @@ dynamic_dynamic.o: $(srcdir)/dynamic.cpp $(CXXC) -c -o $@ $(DYNAMIC_CXXFLAGS) $< dynamic_dynamic_rc.o: $(srcdir)/dynamic.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all diff --git a/samples/dynamic/makefile.bcc b/samples/dynamic/makefile.bcc index 044f6dd..6d26b38 100644 --- a/samples/dynamic/makefile.bcc +++ b/samples/dynamic/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -DYNAMIC_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +DYNAMIC_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) DYNAMIC_OBJECTS = \ $(OBJS)\dynamic_dynamic.obj OBJS = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\dynamic.ils del $(OBJS)\dynamic.ils $(OBJS)\dynamic.exe: $(DYNAMIC_OBJECTS) $(OBJS)\dynamic_dynamic.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(DYNAMIC_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\dynamic_dynamic.res | diff --git a/samples/dynamic/makefile.gcc b/samples/dynamic/makefile.gcc index 0d998ff..191ada2 100644 --- a/samples/dynamic/makefile.gcc +++ b/samples/dynamic/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -DYNAMIC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +DYNAMIC_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) DYNAMIC_OBJECTS = \ $(OBJS)\dynamic_dynamic.o \ $(OBJS)\dynamic_dynamic_rc.o diff --git a/samples/dynamic/makefile.vc b/samples/dynamic/makefile.vc index 2c3e759..e7f6d4e 100644 --- a/samples/dynamic/makefile.vc +++ b/samples/dynamic/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -DYNAMIC_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\dynamic.pdb $(____DEBUGRUNTIME_2_p) \ +DYNAMIC_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\dynamic.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) DYNAMIC_OBJECTS = \ $(OBJS)\dynamic_dynamic.obj \ $(OBJS)\dynamic_dynamic.res diff --git a/samples/dynamic/makefile.wat b/samples/dynamic/makefile.wat index d93c89d..4a26082 100644 --- a/samples/dynamic/makefile.wat +++ b/samples/dynamic/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -DYNAMIC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +DYNAMIC_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) DYNAMIC_OBJECTS = & $(OBJS)\dynamic_dynamic.obj OBJS = & diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in index 4102550..d6b614d 100644 --- a/samples/erase/Makefile.in +++ b/samples/erase/Makefile.in @@ -35,9 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -ERASE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +ERASE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) ERASE_OBJECTS = \ $(__erase_os2_lib_res) \ erase_erase.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o erase$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o erase$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -150,7 +149,7 @@ erase_erase.o: $(srcdir)/erase.cpp $(CXXC) -c -o $@ $(ERASE_CXXFLAGS) $< erase_erase_rc.o: $(srcdir)/erase.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all diff --git a/samples/erase/makefile.bcc b/samples/erase/makefile.bcc index 4afa72e..83eea2d 100644 --- a/samples/erase/makefile.bcc +++ b/samples/erase/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -ERASE_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +ERASE_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) ERASE_OBJECTS = \ $(OBJS)\erase_erase.obj OBJS = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\erase.ils del $(OBJS)\erase.ils $(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_erase.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| 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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\erase_erase.res | diff --git a/samples/erase/makefile.gcc b/samples/erase/makefile.gcc index f12b022..c6831a9 100644 --- a/samples/erase/makefile.gcc +++ b/samples/erase/makefile.gcc @@ -12,11 +12,10 @@ include ../../build/msw/config.gcc ### Variables: ### -ERASE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +ERASE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) ERASE_OBJECTS = \ $(OBJS)\erase_erase.o \ $(OBJS)\erase_erase_rc.o diff --git a/samples/erase/makefile.vc b/samples/erase/makefile.vc index 87acef4..913801f 100644 --- a/samples/erase/makefile.vc +++ b/samples/erase/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -ERASE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +ERASE_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\erase.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) ERASE_OBJECTS = \ $(OBJS)\erase_erase.obj \ $(OBJS)\erase_erase.res diff --git a/samples/erase/makefile.wat b/samples/erase/makefile.wat index 5994201..987f722 100644 --- a/samples/erase/makefile.wat +++ b/samples/erase/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -ERASE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +ERASE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) ERASE_OBJECTS = & $(OBJS)\erase_erase.obj OBJS = & diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in index 1c7109f..c95fa0b 100644 --- a/samples/event/Makefile.in +++ b/samples/event/Makefile.in @@ -35,9 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -EVENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +EVENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) EVENT_OBJECTS = \ $(__event_os2_lib_res) \ event_event.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o event$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o event$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -150,7 +149,7 @@ event_event.o: $(srcdir)/event.cpp $(CXXC) -c -o $@ $(EVENT_CXXFLAGS) $< event_event_rc.o: $(srcdir)/event.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all diff --git a/samples/event/makefile.bcc b/samples/event/makefile.bcc index 4564e8a..2d2567b 100644 --- a/samples/event/makefile.bcc +++ b/samples/event/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -EVENT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +EVENT_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) EVENT_OBJECTS = \ $(OBJS)\event_event.obj OBJS = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\event.ils del $(OBJS)\event.ils $(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_event.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| 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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\event_event.res | diff --git a/samples/event/makefile.gcc b/samples/event/makefile.gcc index c2340e7..318b31c 100644 --- a/samples/event/makefile.gcc +++ b/samples/event/makefile.gcc @@ -12,11 +12,10 @@ include ../../build/msw/config.gcc ### Variables: ### -EVENT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +EVENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) EVENT_OBJECTS = \ $(OBJS)\event_event.o \ $(OBJS)\event_event_rc.o diff --git a/samples/event/makefile.vc b/samples/event/makefile.vc index cfd8149..67aba6f 100644 --- a/samples/event/makefile.vc +++ b/samples/event/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -EVENT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +EVENT_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\event.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) EVENT_OBJECTS = \ $(OBJS)\event_event.obj \ $(OBJS)\event_event.res diff --git a/samples/event/makefile.wat b/samples/event/makefile.wat index e3752ef..5e1abc3 100644 --- a/samples/event/makefile.wat +++ b/samples/event/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -EVENT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +EVENT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) EVENT_OBJECTS = & $(OBJS)\event_event.obj OBJS = & diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in index a95271f..2d75ad1 100644 --- a/samples/except/Makefile.in +++ b/samples/except/Makefile.in @@ -35,9 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -EXCEPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +EXCEPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) EXCEPT_OBJECTS = \ $(__except___win32rc) \ $(__except_os2_lib_res) \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o except$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o except$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -150,7 +149,7 @@ except_except.o: $(srcdir)/except.cpp $(CXXC) -c -o $@ $(EXCEPT_CXXFLAGS) $< except_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all diff --git a/samples/except/makefile.bcc b/samples/except/makefile.bcc index aeea83d..b7e2887 100644 --- a/samples/except/makefile.bcc +++ b/samples/except/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -EXCEPT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +EXCEPT_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) EXCEPT_OBJECTS = \ $(OBJS)\except_except.obj OBJS = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\except.ils del $(OBJS)\except.ils $(OBJS)\except.exe: $(EXCEPT_OBJECTS) $(OBJS)\except_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(EXCEPT_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\except_sample.res | diff --git a/samples/except/makefile.gcc b/samples/except/makefile.gcc index d952a2f..019a910 100644 --- a/samples/except/makefile.gcc +++ b/samples/except/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -EXCEPT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +EXCEPT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) EXCEPT_OBJECTS = \ $(OBJS)\except_sample_rc.o \ $(OBJS)\except_except.o diff --git a/samples/except/makefile.vc b/samples/except/makefile.vc index 0775483..0e6266a 100644 --- a/samples/except/makefile.vc +++ b/samples/except/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -EXCEPT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +EXCEPT_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\except.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) EXCEPT_OBJECTS = \ $(OBJS)\except_sample.res \ $(OBJS)\except_except.obj diff --git a/samples/except/makefile.wat b/samples/except/makefile.wat index 743b918..38f628f 100644 --- a/samples/except/makefile.wat +++ b/samples/except/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -EXCEPT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +EXCEPT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) EXCEPT_OBJECTS = & $(OBJS)\except_except.obj OBJS = & diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in index 9282ecb..8c57209 100644 --- a/samples/exec/Makefile.in +++ b/samples/exec/Makefile.in @@ -35,9 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -EXEC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +EXEC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) EXEC_OBJECTS = \ $(__exec_os2_lib_res) \ exec_exec.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o exec$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o exec$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -150,7 +149,7 @@ exec_exec.o: $(srcdir)/exec.cpp $(CXXC) -c -o $@ $(EXEC_CXXFLAGS) $< exec_exec_rc.o: $(srcdir)/exec.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all diff --git a/samples/exec/makefile.bcc b/samples/exec/makefile.bcc index cb4b270..e1b6265 100644 --- a/samples/exec/makefile.bcc +++ b/samples/exec/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -EXEC_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +EXEC_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) EXEC_OBJECTS = \ $(OBJS)\exec_exec.obj OBJS = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\exec.ils del $(OBJS)\exec.ils $(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_exec.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(EXEC_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\exec_exec.res | diff --git a/samples/exec/makefile.gcc b/samples/exec/makefile.gcc index 6af880b..8266111 100644 --- a/samples/exec/makefile.gcc +++ b/samples/exec/makefile.gcc @@ -12,11 +12,10 @@ include ../../build/msw/config.gcc ### Variables: ### -EXEC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +EXEC_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) EXEC_OBJECTS = \ $(OBJS)\exec_exec.o \ $(OBJS)\exec_exec_rc.o diff --git a/samples/exec/makefile.vc b/samples/exec/makefile.vc index d540700..b1862ca 100644 --- a/samples/exec/makefile.vc +++ b/samples/exec/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -EXEC_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +EXEC_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\exec.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) EXEC_OBJECTS = \ $(OBJS)\exec_exec.obj \ $(OBJS)\exec_exec.res diff --git a/samples/exec/makefile.wat b/samples/exec/makefile.wat index fb7d579..efd32ea 100644 --- a/samples/exec/makefile.wat +++ b/samples/exec/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -EXEC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +EXEC_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) EXEC_OBJECTS = & $(OBJS)\exec_exec.obj OBJS = & diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in index e43f35c..5d15243 100644 --- a/samples/font/Makefile.in +++ b/samples/font/Makefile.in @@ -35,9 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -FONT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +FONT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) FONT_OBJECTS = \ $(__font_os2_lib_res) \ font_font.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o font$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o font$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -150,7 +149,7 @@ font_font.o: $(srcdir)/font.cpp $(CXXC) -c -o $@ $(FONT_CXXFLAGS) $< font_font_rc.o: $(srcdir)/font.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all diff --git a/samples/font/makefile.bcc b/samples/font/makefile.bcc index fda2266..3c79fb2 100644 --- a/samples/font/makefile.bcc +++ b/samples/font/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -FONT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +FONT_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) FONT_OBJECTS = \ $(OBJS)\font_font.obj OBJS = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\font.ils del $(OBJS)\font.ils $(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_font.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| 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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\font_font.res | diff --git a/samples/font/makefile.gcc b/samples/font/makefile.gcc index 363944b..38f7b16 100644 --- a/samples/font/makefile.gcc +++ b/samples/font/makefile.gcc @@ -12,11 +12,10 @@ include ../../build/msw/config.gcc ### Variables: ### -FONT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +FONT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) FONT_OBJECTS = \ $(OBJS)\font_font.o \ $(OBJS)\font_font_rc.o diff --git a/samples/font/makefile.vc b/samples/font/makefile.vc index f1bdb94..b31538a 100644 --- a/samples/font/makefile.vc +++ b/samples/font/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -FONT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +FONT_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\font.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) FONT_OBJECTS = \ $(OBJS)\font_font.obj \ $(OBJS)\font_font.res diff --git a/samples/font/makefile.wat b/samples/font/makefile.wat index 3faf005..ca9cec7 100644 --- a/samples/font/makefile.wat +++ b/samples/font/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -FONT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +FONT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) FONT_OBJECTS = & $(OBJS)\font_font.obj OBJS = & diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in index 81ce42a..2443682 100644 --- a/samples/grid/Makefile.in +++ b/samples/grid/Makefile.in @@ -35,9 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -GRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +GRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) GRID_OBJECTS = \ $(__grid_os2_lib_res) \ grid_griddemo.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o grid$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o grid$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ @@ -153,7 +152,7 @@ grid_griddemo.o: $(srcdir)/griddemo.cpp $(CXXC) -c -o $@ $(GRID_CXXFLAGS) $< grid_griddemo_rc.o: $(srcdir)/griddemo.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all diff --git a/samples/grid/makefile.bcc b/samples/grid/makefile.bcc index 5222418..7f3dbff 100644 --- a/samples/grid/makefile.bcc +++ b/samples/grid/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -GRID_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +GRID_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) GRID_OBJECTS = \ $(OBJS)\grid_griddemo.obj OBJS = \ @@ -174,6 +175,6 @@ clean: -if exist $(OBJS)\grid.ils del $(OBJS)\grid.ils $(OBJS)\grid.exe: $(GRID_OBJECTS) $(OBJS)\grid_griddemo.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(GRID_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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\grid_griddemo.res | diff --git a/samples/grid/makefile.gcc b/samples/grid/makefile.gcc index 1da96c0..0c12c2e 100644 --- a/samples/grid/makefile.gcc +++ b/samples/grid/makefile.gcc @@ -12,11 +12,10 @@ include ../../build/msw/config.gcc ### Variables: ### -GRID_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +GRID_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) GRID_OBJECTS = \ $(OBJS)\grid_griddemo.o \ $(OBJS)\grid_griddemo_rc.o diff --git a/samples/grid/makefile.vc b/samples/grid/makefile.vc index 7e31393..ad51a2c 100644 --- a/samples/grid/makefile.vc +++ b/samples/grid/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -GRID_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +GRID_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\grid.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) GRID_OBJECTS = \ $(OBJS)\grid_griddemo.obj \ $(OBJS)\grid_griddemo.res diff --git a/samples/grid/makefile.wat b/samples/grid/makefile.wat index 1abedaa..bac0f56 100644 --- a/samples/grid/makefile.wat +++ b/samples/grid/makefile.wat @@ -172,10 +172,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -GRID_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +GRID_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) GRID_OBJECTS = & $(OBJS)\grid_griddemo.obj OBJS = & diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in index ff6556a..44a4ba4 100644 --- a/samples/help/Makefile.in +++ b/samples/help/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) HELP_OBJECTS = \ $(__help_os2_lib_res) \ help_demo.o \ @@ -78,8 +77,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o help$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o help$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ help_demo.o: $(srcdir)/demo.cpp $(CXXC) -c -o $@ $(HELP_CXXFLAGS) $< help_demo_rc.o: $(srcdir)/demo.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all diff --git a/samples/help/makefile.bcc b/samples/help/makefile.bcc index d1c9874..d4b0051 100644 --- a/samples/help/makefile.bcc +++ b/samples/help/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -HELP_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +HELP_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) HELP_OBJECTS = \ $(OBJS)\help_demo.obj OBJS = \ @@ -174,6 +175,6 @@ clean: -if exist $(OBJS)\help.ils del $(OBJS)\help.ils $(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(HELP_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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\help_demo.res | diff --git a/samples/help/makefile.gcc b/samples/help/makefile.gcc index d756539..641ce5b 100644 --- a/samples/help/makefile.gcc +++ b/samples/help/makefile.gcc @@ -12,11 +12,10 @@ include ../../build/msw/config.gcc ### Variables: ### -HELP_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +HELP_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) HELP_OBJECTS = \ $(OBJS)\help_demo.o \ $(OBJS)\help_demo_rc.o diff --git a/samples/help/makefile.vc b/samples/help/makefile.vc index 60d3d92..6a070f6 100644 --- a/samples/help/makefile.vc +++ b/samples/help/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -HELP_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +HELP_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\help.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) HELP_OBJECTS = \ $(OBJS)\help_demo.obj \ $(OBJS)\help_demo.res diff --git a/samples/help/makefile.wat b/samples/help/makefile.wat index 2988856..3d19d20 100644 --- a/samples/help/makefile.wat +++ b/samples/help/makefile.wat @@ -172,10 +172,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -HELP_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +HELP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) HELP_OBJECTS = & $(OBJS)\help_demo.obj OBJS = & diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in index 997ecb7..6df52f8 100644 --- a/samples/htlbox/Makefile.in +++ b/samples/htlbox/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -HTLBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +HTLBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) HTLBOX_OBJECTS = \ $(__htlbox_os2_lib_res) \ htlbox_htlbox.o \ @@ -78,8 +77,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o htlbox$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o htlbox$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ htlbox_htlbox.o: $(srcdir)/htlbox.cpp $(CXXC) -c -o $@ $(HTLBOX_CXXFLAGS) $< htlbox_htlbox_rc.o: $(srcdir)/htlbox.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all diff --git a/samples/htlbox/makefile.bcc b/samples/htlbox/makefile.bcc index 450d10e..94018c0 100644 --- a/samples/htlbox/makefile.bcc +++ b/samples/htlbox/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -HTLBOX_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +HTLBOX_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) HTLBOX_OBJECTS = \ $(OBJS)\htlbox_htlbox.obj OBJS = \ @@ -174,6 +175,6 @@ clean: -if exist $(OBJS)\htlbox.ils del $(OBJS)\htlbox.ils $(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| 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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\htlbox_htlbox.res | diff --git a/samples/htlbox/makefile.gcc b/samples/htlbox/makefile.gcc index 1c28d6f..bf3cae2 100644 --- a/samples/htlbox/makefile.gcc +++ b/samples/htlbox/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -HTLBOX_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +HTLBOX_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) HTLBOX_OBJECTS = \ $(OBJS)\htlbox_htlbox.o \ $(OBJS)\htlbox_htlbox_rc.o diff --git a/samples/htlbox/makefile.vc b/samples/htlbox/makefile.vc index 0b91124..139d798 100644 --- a/samples/htlbox/makefile.vc +++ b/samples/htlbox/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -HTLBOX_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +HTLBOX_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\htlbox.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) HTLBOX_OBJECTS = \ $(OBJS)\htlbox_htlbox.obj \ $(OBJS)\htlbox_htlbox.res diff --git a/samples/htlbox/makefile.wat b/samples/htlbox/makefile.wat index 007f55e..67ec00d 100644 --- a/samples/htlbox/makefile.wat +++ b/samples/htlbox/makefile.wat @@ -172,10 +172,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -HTLBOX_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +HTLBOX_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) HTLBOX_OBJECTS = & $(OBJS)\htlbox_htlbox.obj OBJS = & diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in index 7bc34a4..d491fd3 100644 --- a/samples/html/about/Makefile.in +++ b/samples/html/about/Makefile.in @@ -35,9 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### -ABOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) +ABOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) ABOUT_OBJECTS = \ $(__about_os2_lib_res) \ about_about.o \ @@ -78,8 +77,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o about$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -o about$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -143,7 +142,7 @@ about_about.o: $(srcdir)/about.cpp $(CXXC) -c -o $@ $(ABOUT_CXXFLAGS) $< about_about_rc.o: $(srcdir)/about.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples @COND_PLATFORM_MACOSX_1@about_bundle: about.app/Contents/PkgInfo diff --git a/samples/html/about/makefile.bcc b/samples/html/about/makefile.bcc index 1aeaa81..64186bf 100644 --- a/samples/html/about/makefile.bcc +++ b/samples/html/about/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,13 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -ABOUT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +ABOUT_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) + -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CPPFLAGS) \ + $(CXXFLAGS) ABOUT_OBJECTS = \ $(OBJS)\about_about.obj OBJS = \ @@ -164,7 +166,7 @@ $(OBJS)\about_about.res: .\about.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples $** $(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_about.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| 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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\about_about.res | diff --git a/samples/html/about/makefile.gcc b/samples/html/about/makefile.gcc index a03493c..3051120 100644 --- a/samples/html/about/makefile.gcc +++ b/samples/html/about/makefile.gcc @@ -12,11 +12,11 @@ include ../../../build/msw/config.gcc ### Variables: ### -ABOUT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +ABOUT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) \ + -I.\..\..\..\samples $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) \ + $(CPPFLAGS) $(CXXFLAGS) ABOUT_OBJECTS = \ $(OBJS)\about_about.o \ $(OBJS)\about_about_rc.o diff --git a/samples/html/about/makefile.vc b/samples/html/about/makefile.vc index 734cd23..909f85e 100644 --- a/samples/html/about/makefile.vc +++ b/samples/html/about/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -ABOUT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +ABOUT_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\about.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) ABOUT_OBJECTS = \ $(OBJS)\about_about.obj \ $(OBJS)\about_about.res diff --git a/samples/html/about/makefile.wat b/samples/html/about/makefile.wat index 83bbf50..ce3f285 100644 --- a/samples/html/about/makefile.wat +++ b/samples/html/about/makefile.wat @@ -172,10 +172,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -ABOUT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +ABOUT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) ABOUT_OBJECTS = & $(OBJS)\about_about.obj OBJS = & diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in index db4105e..fa4eb36 100644 --- a/samples/html/help/Makefile.in +++ b/samples/html/help/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) +HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) HELP_OBJECTS = \ $(__help_os2_lib_res) \ help_help.o \ @@ -78,8 +77,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o help$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -o help$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -162,7 +161,7 @@ help_help.o: $(srcdir)/help.cpp $(CXXC) -c -o $@ $(HELP_CXXFLAGS) $< help_help_rc.o: $(srcdir)/help.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples install: all diff --git a/samples/html/help/makefile.bcc b/samples/html/help/makefile.bcc index 639d04a..cbd7c2d 100644 --- a/samples/html/help/makefile.bcc +++ b/samples/html/help/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,13 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -HELP_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +HELP_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) + -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CPPFLAGS) \ + $(CXXFLAGS) HELP_OBJECTS = \ $(OBJS)\help_help.obj OBJS = \ @@ -178,6 +180,6 @@ data: 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)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_help.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(HELP_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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\help_help.res | diff --git a/samples/html/help/makefile.gcc b/samples/html/help/makefile.gcc index 342d6be..95db19d 100644 --- a/samples/html/help/makefile.gcc +++ b/samples/html/help/makefile.gcc @@ -12,11 +12,11 @@ include ../../../build/msw/config.gcc ### Variables: ### -HELP_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +HELP_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) \ + -I.\..\..\..\samples $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) \ + $(CPPFLAGS) $(CXXFLAGS) HELP_OBJECTS = \ $(OBJS)\help_help.o \ $(OBJS)\help_help_rc.o diff --git a/samples/html/help/makefile.vc b/samples/html/help/makefile.vc index bca9f8f..ebcebdf 100644 --- a/samples/html/help/makefile.vc +++ b/samples/html/help/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -HELP_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +HELP_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\help.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) HELP_OBJECTS = \ $(OBJS)\help_help.obj \ $(OBJS)\help_help.res diff --git a/samples/html/help/makefile.wat b/samples/html/help/makefile.wat index f992deb..cc69c38 100644 --- a/samples/html/help/makefile.wat +++ b/samples/html/help/makefile.wat @@ -172,10 +172,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -HELP_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +HELP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) HELP_OBJECTS = & $(OBJS)\help_help.obj OBJS = & diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in index a1ff41a..3d89990 100644 --- a/samples/html/helpview/Makefile.in +++ b/samples/html/helpview/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) +HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) HELPVIEW_OBJECTS = \ $(__helpview_os2_lib_res) \ helpview_helpview.o \ @@ -78,8 +77,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o helpview$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -o helpview$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -162,7 +161,7 @@ helpview_helpview.o: $(srcdir)/helpview.cpp $(CXXC) -c -o $@ $(HELPVIEW_CXXFLAGS) $< helpview_helpview_rc.o: $(srcdir)/helpview.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples install: all diff --git a/samples/html/helpview/makefile.bcc b/samples/html/helpview/makefile.bcc index 0b39097..17ccdba 100644 --- a/samples/html/helpview/makefile.bcc +++ b/samples/html/helpview/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,13 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -HELPVIEW_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +HELPVIEW_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) + -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CPPFLAGS) \ + $(CXXFLAGS) HELPVIEW_OBJECTS = \ $(OBJS)\helpview_helpview.obj OBJS = \ @@ -178,6 +180,6 @@ data: for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| 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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\helpview_helpview.res | diff --git a/samples/html/helpview/makefile.gcc b/samples/html/helpview/makefile.gcc index c48f632..ac20a6f 100644 --- a/samples/html/helpview/makefile.gcc +++ b/samples/html/helpview/makefile.gcc @@ -12,11 +12,11 @@ include ../../../build/msw/config.gcc ### Variables: ### -HELPVIEW_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +HELPVIEW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) HELPVIEW_OBJECTS = \ $(OBJS)\helpview_helpview.o \ $(OBJS)\helpview_helpview_rc.o diff --git a/samples/html/helpview/makefile.vc b/samples/html/helpview/makefile.vc index c3139dd..c6ddce0 100644 --- a/samples/html/helpview/makefile.vc +++ b/samples/html/helpview/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -HELPVIEW_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\helpview.pdb $(____DEBUGRUNTIME_2_p) \ +HELPVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\helpview.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) HELPVIEW_OBJECTS = \ $(OBJS)\helpview_helpview.obj \ $(OBJS)\helpview_helpview.res diff --git a/samples/html/helpview/makefile.wat b/samples/html/helpview/makefile.wat index ee7a90e..8c83f32 100644 --- a/samples/html/helpview/makefile.wat +++ b/samples/html/helpview/makefile.wat @@ -172,10 +172,11 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -HELPVIEW_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +HELPVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + $(__DLLFLAG_p) -i=.\..\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) & + $(CXXFLAGS) HELPVIEW_OBJECTS = & $(OBJS)\helpview_helpview.obj OBJS = & diff --git a/samples/html/makefile.bcc b/samples/html/makefile.bcc index 6c92dc7..d552e46 100644 --- a/samples/html/makefile.bcc +++ b/samples/html/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,10 +19,6 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### MAKEARGS = -DCPPFLAGS="$(CPPFLAGS)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \ diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in index a22a83d..6fd4bdc 100644 --- a/samples/html/printing/Makefile.in +++ b/samples/html/printing/Makefile.in @@ -37,9 +37,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -PRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) +PRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) PRINTING_OBJECTS = \ $(__printing_os2_lib_res) \ printing_printing.o \ @@ -78,8 +77,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o printing$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -o printing$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -166,7 +165,7 @@ printing_printing.o: $(srcdir)/printing.cpp $(CXXC) -c -o $@ $(PRINTING_CXXFLAGS) $< printing_printing_rc.o: $(srcdir)/printing.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples uninstall: diff --git a/samples/html/printing/makefile.bcc b/samples/html/printing/makefile.bcc index a3120d8..c6a3698 100644 --- a/samples/html/printing/makefile.bcc +++ b/samples/html/printing/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,18 +19,15 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PRINTING_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +PRINTING_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) + -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CPPFLAGS) \ + $(CXXFLAGS) PRINTING_OBJECTS = \ $(OBJS)\printing_printing.obj SETUPHDIR = \ @@ -178,6 +180,6 @@ data: for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(PRINTING_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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\printing_printing.res | diff --git a/samples/html/printing/makefile.gcc b/samples/html/printing/makefile.gcc index b1aabee..f472b44 100644 --- a/samples/html/printing/makefile.gcc +++ b/samples/html/printing/makefile.gcc @@ -14,11 +14,11 @@ include ../../../build/msw/config.gcc OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PRINTING_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +PRINTING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) PRINTING_OBJECTS = \ $(OBJS)\printing_printing.o \ $(OBJS)\printing_printing_rc.o diff --git a/samples/html/printing/makefile.vc b/samples/html/printing/makefile.vc index dc41b64..1574e2e 100644 --- a/samples/html/printing/makefile.vc +++ b/samples/html/printing/makefile.vc @@ -14,12 +14,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PRINTING_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\printing.pdb $(____DEBUGRUNTIME_2_p) \ +PRINTING_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\printing.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) PRINTING_OBJECTS = \ $(OBJS)\printing_printing.obj \ $(OBJS)\printing_printing.res diff --git a/samples/html/printing/makefile.wat b/samples/html/printing/makefile.wat index 43b7f8e..f7b02f7 100644 --- a/samples/html/printing/makefile.wat +++ b/samples/html/printing/makefile.wat @@ -174,10 +174,11 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PRINTING_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +PRINTING_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + $(__DLLFLAG_p) -i=.\..\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) & + $(CXXFLAGS) PRINTING_OBJECTS = & $(OBJS)\printing_printing.obj SETUPHDIR = & diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in index d670d6f..36c837e 100644 --- a/samples/html/test/Makefile.in +++ b/samples/html/test/Makefile.in @@ -37,9 +37,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) +TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = \ $(__test_os2_lib_res) \ test_test.o \ @@ -78,8 +77,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o test$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -o test$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -168,7 +167,7 @@ test_test.o: $(srcdir)/test.cpp $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< test_test_rc.o: $(srcdir)/test.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples uninstall: diff --git a/samples/html/test/makefile.bcc b/samples/html/test/makefile.bcc index 3d52fff..7916f5c 100644 --- a/samples/html/test/makefile.bcc +++ b/samples/html/test/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,17 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +TEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) + -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CPPFLAGS) \ + $(CXXFLAGS) TEST_OBJECTS = \ $(OBJS)\test_test.obj @@ -181,6 +183,6 @@ data: for %f in (f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm i18n.gif 8859_2.htm cp1250.htm regres.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| 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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\test_test.res | diff --git a/samples/html/test/makefile.gcc b/samples/html/test/makefile.gcc index 7f02362..ba03029 100644 --- a/samples/html/test/makefile.gcc +++ b/samples/html/test/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) \ + -I.\..\..\..\samples $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) \ + $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = \ $(OBJS)\test_test.o \ $(OBJS)\test_test_rc.o diff --git a/samples/html/test/makefile.vc b/samples/html/test/makefile.vc index 9ed1e65..7ee1edf 100644 --- a/samples/html/test/makefile.vc +++ b/samples/html/test/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\test.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = \ $(OBJS)\test_test.obj \ $(OBJS)\test_test.res diff --git a/samples/html/test/makefile.wat b/samples/html/test/makefile.wat index 41b30eb..65f132a 100644 --- a/samples/html/test/makefile.wat +++ b/samples/html/test/makefile.wat @@ -180,10 +180,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +TEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = & $(OBJS)\test_test.obj diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in index 2e67f68..0d2d6c6 100644 --- a/samples/html/virtual/Makefile.in +++ b/samples/html/virtual/Makefile.in @@ -37,9 +37,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -VIRTUAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) +VIRTUAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) VIRTUAL_OBJECTS = \ $(__virtual_os2_lib_res) \ virtual_virtual.o \ @@ -78,8 +77,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o virtual$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -o virtual$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -168,7 +167,7 @@ virtual_virtual.o: $(srcdir)/virtual.cpp $(CXXC) -c -o $@ $(VIRTUAL_CXXFLAGS) $< virtual_virtual_rc.o: $(srcdir)/virtual.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples # Include dependency info, if present: diff --git a/samples/html/virtual/makefile.bcc b/samples/html/virtual/makefile.bcc index 2cc6d77..b82100c 100644 --- a/samples/html/virtual/makefile.bcc +++ b/samples/html/virtual/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,17 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -VIRTUAL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +VIRTUAL_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) + -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CPPFLAGS) \ + $(CXXFLAGS) VIRTUAL_OBJECTS = \ $(OBJS)\virtual_virtual.obj @@ -178,6 +180,6 @@ data: for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| 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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\virtual_virtual.res | diff --git a/samples/html/virtual/makefile.gcc b/samples/html/virtual/makefile.gcc index a5f6d5a..42a98f7 100644 --- a/samples/html/virtual/makefile.gcc +++ b/samples/html/virtual/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -VIRTUAL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +VIRTUAL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) VIRTUAL_OBJECTS = \ $(OBJS)\virtual_virtual.o \ $(OBJS)\virtual_virtual_rc.o diff --git a/samples/html/virtual/makefile.vc b/samples/html/virtual/makefile.vc index beda926..be1ff22 100644 --- a/samples/html/virtual/makefile.vc +++ b/samples/html/virtual/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -VIRTUAL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\virtual.pdb $(____DEBUGRUNTIME_2_p) \ +VIRTUAL_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\virtual.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) VIRTUAL_OBJECTS = \ $(OBJS)\virtual_virtual.obj \ $(OBJS)\virtual_virtual.res diff --git a/samples/html/virtual/makefile.wat b/samples/html/virtual/makefile.wat index c712a24..d830c5d 100644 --- a/samples/html/virtual/makefile.wat +++ b/samples/html/virtual/makefile.wat @@ -176,10 +176,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -VIRTUAL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +VIRTUAL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) VIRTUAL_OBJECTS = & $(OBJS)\virtual_virtual.obj diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in index 294df4c..aa1c8cf 100644 --- a/samples/html/widget/Makefile.in +++ b/samples/html/widget/Makefile.in @@ -37,9 +37,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WIDGET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) +WIDGET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) WIDGET_OBJECTS = \ $(__widget_os2_lib_res) \ widget_widget.o \ @@ -78,8 +77,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o widget$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -o widget$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -168,7 +167,7 @@ widget_widget.o: $(srcdir)/widget.cpp $(CXXC) -c -o $@ $(WIDGET_CXXFLAGS) $< widget_widget_rc.o: $(srcdir)/widget.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples # Include dependency info, if present: diff --git a/samples/html/widget/makefile.bcc b/samples/html/widget/makefile.bcc index b8096d6..bdabb6e 100644 --- a/samples/html/widget/makefile.bcc +++ b/samples/html/widget/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,17 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WIDGET_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +WIDGET_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) + -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CPPFLAGS) \ + $(CXXFLAGS) WIDGET_OBJECTS = \ $(OBJS)\widget_widget.obj @@ -178,6 +180,6 @@ data: for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| 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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\widget_widget.res | diff --git a/samples/html/widget/makefile.gcc b/samples/html/widget/makefile.gcc index 5774665..f5bcf6c 100644 --- a/samples/html/widget/makefile.gcc +++ b/samples/html/widget/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WIDGET_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +WIDGET_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) WIDGET_OBJECTS = \ $(OBJS)\widget_widget.o \ $(OBJS)\widget_widget_rc.o diff --git a/samples/html/widget/makefile.vc b/samples/html/widget/makefile.vc index c7b56bd..c30eb2f 100644 --- a/samples/html/widget/makefile.vc +++ b/samples/html/widget/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WIDGET_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +WIDGET_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\widget.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) WIDGET_OBJECTS = \ $(OBJS)\widget_widget.obj \ $(OBJS)\widget_widget.res diff --git a/samples/html/widget/makefile.wat b/samples/html/widget/makefile.wat index f9a5d0e..ca63b43 100644 --- a/samples/html/widget/makefile.wat +++ b/samples/html/widget/makefile.wat @@ -176,10 +176,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WIDGET_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +WIDGET_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) WIDGET_OBJECTS = & $(OBJS)\widget_widget.obj diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in index 5a5d642..b244708 100644 --- a/samples/html/zip/Makefile.in +++ b/samples/html/zip/Makefile.in @@ -38,9 +38,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib WX_VERSION = 2.5.1 -ZIP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \ - -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \ - $(CXXFLAGS) +ZIP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) ZIP_OBJECTS = \ $(__zip_os2_lib_res) \ zip_zip.o \ @@ -78,8 +77,8 @@ ZIP_OBJECTS = \ @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o zip$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -o zip$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -167,7 +166,7 @@ zip_zip.o: $(srcdir)/zip.cpp $(CXXC) -c -o $@ $(ZIP_CXXFLAGS) $< zip_zip_rc.o: $(srcdir)/zip.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples # Include dependency info, if present: diff --git a/samples/html/zip/makefile.bcc b/samples/html/zip/makefile.bcc index 4cfb414..34953f1 100644 --- a/samples/html/zip/makefile.bcc +++ b/samples/html/zip/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,17 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -ZIP_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +ZIP_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) + -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CPPFLAGS) \ + $(CXXFLAGS) ZIP_OBJECTS = \ $(OBJS)\zip_zip.obj @@ -178,6 +180,6 @@ data: for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_zip.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| 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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\zip_zip.res | diff --git a/samples/html/zip/makefile.gcc b/samples/html/zip/makefile.gcc index b16cfc1..7ebe3af 100644 --- a/samples/html/zip/makefile.gcc +++ b/samples/html/zip/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -ZIP_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +ZIP_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) \ + -I.\..\..\..\samples $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) \ + $(CPPFLAGS) $(CXXFLAGS) ZIP_OBJECTS = \ $(OBJS)\zip_zip.o \ $(OBJS)\zip_zip_rc.o diff --git a/samples/html/zip/makefile.vc b/samples/html/zip/makefile.vc index e1bab03..6b48254 100644 --- a/samples/html/zip/makefile.vc +++ b/samples/html/zip/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -ZIP_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +ZIP_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\zip.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) ZIP_OBJECTS = \ $(OBJS)\zip_zip.obj \ $(OBJS)\zip_zip.res diff --git a/samples/html/zip/makefile.wat b/samples/html/zip/makefile.wat index 3dd1160..7a01b0a 100644 --- a/samples/html/zip/makefile.wat +++ b/samples/html/zip/makefile.wat @@ -176,10 +176,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -ZIP_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +ZIP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) ZIP_OBJECTS = & $(OBJS)\zip_zip.obj diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in index abb7903..e401a36 100644 --- a/samples/image/Makefile.in +++ b/samples/image/Makefile.in @@ -35,9 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -IMAGE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +IMAGE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) IMAGE_OBJECTS = \ $(__image_os2_lib_res) \ image_image.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o image$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o image$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -158,7 +157,7 @@ image_image.o: $(srcdir)/image.cpp $(CXXC) -c -o $@ $(IMAGE_CXXFLAGS) $< image_image_rc.o: $(srcdir)/image.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all diff --git a/samples/image/makefile.bcc b/samples/image/makefile.bcc index 29bf9e1..2ab9a95 100644 --- a/samples/image/makefile.bcc +++ b/samples/image/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -IMAGE_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +IMAGE_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) IMAGE_OBJECTS = \ $(OBJS)\image_image.obj OBJS = \ @@ -174,6 +175,6 @@ data: for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse.tif horse.xpm horse.cur horse.ico horse3.ani smile.xbm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| 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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\image_image.res | diff --git a/samples/image/makefile.gcc b/samples/image/makefile.gcc index 8ad6bb8..cda4962 100644 --- a/samples/image/makefile.gcc +++ b/samples/image/makefile.gcc @@ -12,11 +12,10 @@ include ../../build/msw/config.gcc ### Variables: ### -IMAGE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +IMAGE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) IMAGE_OBJECTS = \ $(OBJS)\image_image.o \ $(OBJS)\image_image_rc.o diff --git a/samples/image/makefile.vc b/samples/image/makefile.vc index 2787a92..e45b971 100644 --- a/samples/image/makefile.vc +++ b/samples/image/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -IMAGE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +IMAGE_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\image.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) IMAGE_OBJECTS = \ $(OBJS)\image_image.obj \ $(OBJS)\image_image.res diff --git a/samples/image/makefile.wat b/samples/image/makefile.wat index 711f272..44633f3 100644 --- a/samples/image/makefile.wat +++ b/samples/image/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -IMAGE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +IMAGE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) IMAGE_OBJECTS = & $(OBJS)\image_image.obj OBJS = & diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in index 562863f..a4381be 100644 --- a/samples/internat/Makefile.in +++ b/samples/internat/Makefile.in @@ -35,9 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -INTERNAT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +INTERNAT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) INTERNAT_OBJECTS = \ $(__internat_os2_lib_res) \ internat_internat.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o internat$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o internat$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -186,7 +185,7 @@ internat_internat.o: $(srcdir)/internat.cpp $(CXXC) -c -o $@ $(INTERNAT_CXXFLAGS) $< internat_internat_rc.o: $(srcdir)/internat.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples ja: @mkdir -p ./ja diff --git a/samples/internat/makefile.bcc b/samples/internat/makefile.bcc index 11bcbaa..b67ecf7 100644 --- a/samples/internat/makefile.bcc +++ b/samples/internat/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -INTERNAT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +INTERNAT_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) INTERNAT_OBJECTS = \ $(OBJS)\internat_internat.obj OBJS = \ @@ -186,7 +187,7 @@ fr: for %f in (internat.po internat.mo) do if not exist $(OBJS)\fr\%f copy .\fr\%f $(OBJS)\fr $(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(INTERNAT_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\internat_internat.res | diff --git a/samples/internat/makefile.gcc b/samples/internat/makefile.gcc index a03516f..c2750e8 100644 --- a/samples/internat/makefile.gcc +++ b/samples/internat/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -INTERNAT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +INTERNAT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) INTERNAT_OBJECTS = \ $(OBJS)\internat_internat.o \ $(OBJS)\internat_internat_rc.o diff --git a/samples/internat/makefile.vc b/samples/internat/makefile.vc index 4a7fde3..663b2fd 100644 --- a/samples/internat/makefile.vc +++ b/samples/internat/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -INTERNAT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\internat.pdb $(____DEBUGRUNTIME_2_p) \ +INTERNAT_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\internat.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) INTERNAT_OBJECTS = \ $(OBJS)\internat_internat.obj \ $(OBJS)\internat_internat.res diff --git a/samples/internat/makefile.wat b/samples/internat/makefile.wat index e5a0d33..42695a6 100644 --- a/samples/internat/makefile.wat +++ b/samples/internat/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -INTERNAT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +INTERNAT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) INTERNAT_OBJECTS = & $(OBJS)\internat_internat.obj OBJS = & diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in index ba31a04..83fc2c3 100644 --- a/samples/ipc/Makefile.in +++ b/samples/ipc/Makefile.in @@ -34,18 +34,16 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) CLIENT_OBJECTS = \ $(__client___win32rc) \ $(os2_lib_res) \ client_client.o DESTDIR = LIBDIRNAME = $(top_builddir)lib -SERVER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +SERVER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) SERVER_OBJECTS = \ $(__server___win32rc) \ $(os2_lib_res) \ @@ -84,13 +82,13 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o client$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_6) -i \ + $(srcdir)/../../samples -o client$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_2 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o server$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_6) -i \ + $(srcdir)/../../samples -o server$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_3 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -170,7 +168,7 @@ client_client.o: $(srcdir)/client.cpp $(CXXC) -c -o $@ $(CLIENT_CXXFLAGS) $< client_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile @@ -210,7 +208,7 @@ server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in @COND_PLATFORM_MACOSX_1@server_bundle: server.app/Contents/PkgInfo server_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples server_server.o: $(srcdir)/server.cpp $(CXXC) -c -o $@ $(SERVER_CXXFLAGS) $< diff --git a/samples/ipc/makefile.bcc b/samples/ipc/makefile.bcc index 5a678a7..61c9642 100644 --- a/samples/ipc/makefile.bcc +++ b/samples/ipc/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,24 +19,20 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -CLIENT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_0) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) +CLIENT_CXXFLAGS = $(__RUNTIME_LIBS_0) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \ + -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) CLIENT_OBJECTS = \ $(OBJS)\client_client.obj OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SERVER_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_0) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) +SERVER_CXXFLAGS = $(__RUNTIME_LIBS_0) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \ + -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) SERVER_OBJECTS = \ $(OBJS)\server_server.obj SETUPHDIR = \ @@ -191,11 +192,11 @@ clean: -if exist $(OBJS)\server.ils del $(OBJS)\server.ils $(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(CLIENT_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS).lib,, $(OBJS)\client_sample.res | $(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(SERVER_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS).lib,, $(OBJS)\server_sample.res | diff --git a/samples/ipc/makefile.gcc b/samples/ipc/makefile.gcc index 8dd4868..358305e 100644 --- a/samples/ipc/makefile.gcc +++ b/samples/ipc/makefile.gcc @@ -12,21 +12,19 @@ include ../../build/msw/config.gcc ### Variables: ### -CLIENT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_0) \ - $(__EXCEPTIONSFLAG) +CLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ + $(__EXCEPTIONSFLAG_0) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) CLIENT_OBJECTS = \ $(OBJS)\client_sample_rc.o \ $(OBJS)\client_client.o OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SERVER_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_0) \ - $(__EXCEPTIONSFLAG) +SERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ + $(__EXCEPTIONSFLAG_0) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) SERVER_OBJECTS = \ $(OBJS)\server_sample_rc.o \ $(OBJS)\server_server.o diff --git a/samples/ipc/makefile.vc b/samples/ipc/makefile.vc index 911f5ad..273c109 100644 --- a/samples/ipc/makefile.vc +++ b/samples/ipc/makefile.vc @@ -12,23 +12,23 @@ ### Variables: ### -CLIENT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ +CLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO) /Fd$(OBJS)\client.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_0) $(__EXCEPTIONSFLAG) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_0) \ + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) CLIENT_OBJECTS = \ $(OBJS)\client_sample.res \ $(OBJS)\client_client.obj OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SERVER_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_16) /DWIN32 \ +SERVER_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_16) /DWIN32 \ $(__DEBUGINFO) /Fd$(OBJS)\server.pdb $(____DEBUGRUNTIME_15_p) \ $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_0) $(__EXCEPTIONSFLAG) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_0) \ + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) SERVER_OBJECTS = \ $(OBJS)\server_sample.res \ $(OBJS)\server_server.obj diff --git a/samples/ipc/makefile.wat b/samples/ipc/makefile.wat index 4e31bfe..dc43006 100644 --- a/samples/ipc/makefile.wat +++ b/samples/ipc/makefile.wat @@ -171,18 +171,18 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -CLIENT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG) +CLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) CLIENT_OBJECTS = & $(OBJS)\client_client.obj OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SERVER_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG) +SERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) SERVER_OBJECTS = & $(OBJS)\server_server.obj SETUPHDIR = & diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in index 445c6f6..7560371 100644 --- a/samples/joytest/Makefile.in +++ b/samples/joytest/Makefile.in @@ -35,9 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -JOYTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +JOYTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) JOYTEST_OBJECTS = \ $(__joytest_os2_lib_res) \ joytest_joytest.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o joytest$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o joytest$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ @@ -157,7 +156,7 @@ joytest_joytest.o: $(srcdir)/joytest.cpp $(CXXC) -c -o $@ $(JOYTEST_CXXFLAGS) $< joytest_joytest_rc.o: $(srcdir)/joytest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/joytest/makefile.bcc b/samples/joytest/makefile.bcc index ca22d5c..37a27f6 100644 --- a/samples/joytest/makefile.bcc +++ b/samples/joytest/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -JOYTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +JOYTEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) JOYTEST_OBJECTS = \ $(OBJS)\joytest_joytest.obj OBJS = \ @@ -174,6 +175,6 @@ clean: -if exist $(OBJS)\joytest.ils del $(OBJS)\joytest.ils $(OBJS)\joytest.exe: $(JOYTEST_OBJECTS) $(OBJS)\joytest_joytest.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(JOYTEST_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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\joytest_joytest.res | diff --git a/samples/joytest/makefile.gcc b/samples/joytest/makefile.gcc index 7eca3eb..218fa09 100644 --- a/samples/joytest/makefile.gcc +++ b/samples/joytest/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -JOYTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +JOYTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) JOYTEST_OBJECTS = \ $(OBJS)\joytest_joytest.o \ $(OBJS)\joytest_joytest_rc.o diff --git a/samples/joytest/makefile.vc b/samples/joytest/makefile.vc index 020974b..c6f85d7 100644 --- a/samples/joytest/makefile.vc +++ b/samples/joytest/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -JOYTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\joytest.pdb $(____DEBUGRUNTIME_2_p) \ +JOYTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\joytest.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) JOYTEST_OBJECTS = \ $(OBJS)\joytest_joytest.obj \ $(OBJS)\joytest_joytest.res diff --git a/samples/joytest/makefile.wat b/samples/joytest/makefile.wat index 8bf050e..d77e920 100644 --- a/samples/joytest/makefile.wat +++ b/samples/joytest/makefile.wat @@ -172,10 +172,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -JOYTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +JOYTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) JOYTEST_OBJECTS = & $(OBJS)\joytest_joytest.obj OBJS = & diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in index 8e636ee..e80928b 100644 --- a/samples/keyboard/Makefile.in +++ b/samples/keyboard/Makefile.in @@ -35,9 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -KEYBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +KEYBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) KEYBOARD_OBJECTS = \ $(__keyboard_os2_lib_res) \ keyboard_keyboard.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o keyboard$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o keyboard$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ keyboard_keyboard.o: $(srcdir)/keyboard.cpp $(CXXC) -c -o $@ $(KEYBOARD_CXXFLAGS) $< keyboard_keyboard_rc.o: $(srcdir)/keyboard.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/keyboard/makefile.bcc b/samples/keyboard/makefile.bcc index c27b370..3e3a1f2 100644 --- a/samples/keyboard/makefile.bcc +++ b/samples/keyboard/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -KEYBOARD_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +KEYBOARD_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) KEYBOARD_OBJECTS = \ $(OBJS)\keyboard_keyboard.obj OBJS = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\keyboard.ils del $(OBJS)\keyboard.ils $(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(KEYBOARD_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\keyboard_keyboard.res | diff --git a/samples/keyboard/makefile.gcc b/samples/keyboard/makefile.gcc index 7f67629..ed8dadc 100644 --- a/samples/keyboard/makefile.gcc +++ b/samples/keyboard/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -KEYBOARD_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +KEYBOARD_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) KEYBOARD_OBJECTS = \ $(OBJS)\keyboard_keyboard.o \ $(OBJS)\keyboard_keyboard_rc.o diff --git a/samples/keyboard/makefile.vc b/samples/keyboard/makefile.vc index 097e91c..a9ea150 100644 --- a/samples/keyboard/makefile.vc +++ b/samples/keyboard/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -KEYBOARD_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\keyboard.pdb $(____DEBUGRUNTIME_2_p) \ +KEYBOARD_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\keyboard.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) KEYBOARD_OBJECTS = \ $(OBJS)\keyboard_keyboard.obj \ $(OBJS)\keyboard_keyboard.res diff --git a/samples/keyboard/makefile.wat b/samples/keyboard/makefile.wat index 4eb8b3f..c39854c 100644 --- a/samples/keyboard/makefile.wat +++ b/samples/keyboard/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -KEYBOARD_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +KEYBOARD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) KEYBOARD_OBJECTS = & $(OBJS)\keyboard_keyboard.obj OBJS = & diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in index 66e1392..f12953f 100644 --- a/samples/layout/Makefile.in +++ b/samples/layout/Makefile.in @@ -35,9 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -LAYOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +LAYOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) LAYOUT_OBJECTS = \ $(__layout_os2_lib_res) \ layout_layout.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o layout$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o layout$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ layout_layout.o: $(srcdir)/layout.cpp $(CXXC) -c -o $@ $(LAYOUT_CXXFLAGS) $< layout_layout_rc.o: $(srcdir)/layout.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/layout/makefile.bcc b/samples/layout/makefile.bcc index 3a48084..2806af0 100644 --- a/samples/layout/makefile.bcc +++ b/samples/layout/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -LAYOUT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +LAYOUT_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) LAYOUT_OBJECTS = \ $(OBJS)\layout_layout.obj OBJS = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\layout.ils del $(OBJS)\layout.ils $(OBJS)\layout.exe: $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(LAYOUT_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\layout_layout.res | diff --git a/samples/layout/makefile.gcc b/samples/layout/makefile.gcc index 76c2cf4..29f392a 100644 --- a/samples/layout/makefile.gcc +++ b/samples/layout/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -LAYOUT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +LAYOUT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) LAYOUT_OBJECTS = \ $(OBJS)\layout_layout.o \ $(OBJS)\layout_layout_rc.o diff --git a/samples/layout/makefile.vc b/samples/layout/makefile.vc index bb509d5..3153f46 100644 --- a/samples/layout/makefile.vc +++ b/samples/layout/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -LAYOUT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +LAYOUT_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\layout.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) LAYOUT_OBJECTS = \ $(OBJS)\layout_layout.obj \ $(OBJS)\layout_layout.res diff --git a/samples/layout/makefile.wat b/samples/layout/makefile.wat index ceac806..9904be9 100644 --- a/samples/layout/makefile.wat +++ b/samples/layout/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -LAYOUT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +LAYOUT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) LAYOUT_OBJECTS = & $(OBJS)\layout_layout.obj OBJS = & diff --git a/samples/listbox/Makefile.in b/samples/listbox/Makefile.in index e0e5a84..7d87ccd 100644 --- a/samples/listbox/Makefile.in +++ b/samples/listbox/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -LISTBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +LISTBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) LISTBOX_OBJECTS = \ $(__listbox___win32rc) \ $(__listbox_os2_lib_res) \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o listbox$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o listbox$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ listbox_lboxtest.o: $(srcdir)/lboxtest.cpp $(CXXC) -c -o $@ $(LISTBOX_CXXFLAGS) $< listbox_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/listbox/makefile.bcc b/samples/listbox/makefile.bcc index b3c7f41..5cbe6f0 100644 --- a/samples/listbox/makefile.bcc +++ b/samples/listbox/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -LISTBOX_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +LISTBOX_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) LISTBOX_OBJECTS = \ $(OBJS)\listbox_lboxtest.obj OBJS = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\listbox.ils del $(OBJS)\listbox.ils $(OBJS)\listbox.exe: $(LISTBOX_OBJECTS) $(OBJS)\listbox_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(LISTBOX_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\listbox_sample.res | diff --git a/samples/listbox/makefile.gcc b/samples/listbox/makefile.gcc index ee33509..5eccff8 100644 --- a/samples/listbox/makefile.gcc +++ b/samples/listbox/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -LISTBOX_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +LISTBOX_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) LISTBOX_OBJECTS = \ $(OBJS)\listbox_sample_rc.o \ $(OBJS)\listbox_lboxtest.o diff --git a/samples/listbox/makefile.vc b/samples/listbox/makefile.vc index 51af0c5..23962e9 100644 --- a/samples/listbox/makefile.vc +++ b/samples/listbox/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -LISTBOX_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\listbox.pdb $(____DEBUGRUNTIME_2_p) \ +LISTBOX_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\listbox.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) LISTBOX_OBJECTS = \ $(OBJS)\listbox_sample.res \ $(OBJS)\listbox_lboxtest.obj diff --git a/samples/listbox/makefile.wat b/samples/listbox/makefile.wat index c8d4dad..e6ee88d 100644 --- a/samples/listbox/makefile.wat +++ b/samples/listbox/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -LISTBOX_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +LISTBOX_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) LISTBOX_OBJECTS = & $(OBJS)\listbox_lboxtest.obj OBJS = & diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in index 1d61c79..f856890 100644 --- a/samples/listctrl/Makefile.in +++ b/samples/listctrl/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -LISTCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +LISTCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) LISTCTRL_OBJECTS = \ $(__listctrl_os2_lib_res) \ listctrl_listtest.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o listctrl$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o listctrl$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ listctrl_listtest.o: $(srcdir)/listtest.cpp $(CXXC) -c -o $@ $(LISTCTRL_CXXFLAGS) $< listctrl_listtest_rc.o: $(srcdir)/listtest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/listctrl/makefile.bcc b/samples/listctrl/makefile.bcc index 262f3b0..71afb6f 100644 --- a/samples/listctrl/makefile.bcc +++ b/samples/listctrl/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -LISTCTRL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +LISTCTRL_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) LISTCTRL_OBJECTS = \ $(OBJS)\listctrl_listtest.obj OBJS = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\listctrl.ils del $(OBJS)\listctrl.ils $(OBJS)\listctrl.exe: $(LISTCTRL_OBJECTS) $(OBJS)\listctrl_listtest.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(LISTCTRL_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\listctrl_listtest.res | diff --git a/samples/listctrl/makefile.gcc b/samples/listctrl/makefile.gcc index 0752d66..0fb52af 100644 --- a/samples/listctrl/makefile.gcc +++ b/samples/listctrl/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -LISTCTRL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +LISTCTRL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) LISTCTRL_OBJECTS = \ $(OBJS)\listctrl_listtest.o \ $(OBJS)\listctrl_listtest_rc.o diff --git a/samples/listctrl/makefile.vc b/samples/listctrl/makefile.vc index 6753768..315da64 100644 --- a/samples/listctrl/makefile.vc +++ b/samples/listctrl/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -LISTCTRL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\listctrl.pdb $(____DEBUGRUNTIME_2_p) \ +LISTCTRL_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\listctrl.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) LISTCTRL_OBJECTS = \ $(OBJS)\listctrl_listtest.obj \ $(OBJS)\listctrl_listtest.res diff --git a/samples/listctrl/makefile.wat b/samples/listctrl/makefile.wat index 8fd9845..c9447ef 100644 --- a/samples/listctrl/makefile.wat +++ b/samples/listctrl/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -LISTCTRL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +LISTCTRL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) LISTCTRL_OBJECTS = & $(OBJS)\listctrl_listtest.obj OBJS = & diff --git a/samples/makefile.bcc b/samples/makefile.bcc index 4e7afdd..b496b4f 100644 --- a/samples/makefile.bcc +++ b/samples/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,10 +19,6 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### MAKEARGS = -DCPPFLAGS="$(CPPFLAGS)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \ diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in index 77978d9..532a0f2 100644 --- a/samples/mdi/Makefile.in +++ b/samples/mdi/Makefile.in @@ -36,8 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -MDI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \ - -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +MDI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) MDI_OBJECTS = \ $(__mdi_os2_lib_res) \ mdi_mdi.o \ @@ -76,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o mdi$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o mdi$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -152,7 +152,7 @@ mdi_mdi.o: $(srcdir)/mdi.cpp $(CXXC) -c -o $@ $(MDI_CXXFLAGS) $< mdi_mdi_rc.o: $(srcdir)/mdi.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/mdi/makefile.bcc b/samples/mdi/makefile.bcc index 18e4807..45f3ad9 100644 --- a/samples/mdi/makefile.bcc +++ b/samples/mdi/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -MDI_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +MDI_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) MDI_OBJECTS = \ $(OBJS)\mdi_mdi.obj OBJS = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\mdi.ils del $(OBJS)\mdi.ils $(OBJS)\mdi.exe: $(MDI_OBJECTS) $(OBJS)\mdi_mdi.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(MDI_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\mdi_mdi.res | diff --git a/samples/mdi/makefile.gcc b/samples/mdi/makefile.gcc index 38b0e16..be492cd 100644 --- a/samples/mdi/makefile.gcc +++ b/samples/mdi/makefile.gcc @@ -12,11 +12,10 @@ include ../../build/msw/config.gcc ### Variables: ### -MDI_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +MDI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) MDI_OBJECTS = \ $(OBJS)\mdi_mdi.o \ $(OBJS)\mdi_mdi_rc.o diff --git a/samples/mdi/makefile.vc b/samples/mdi/makefile.vc index 9f4e610..2953cb2 100644 --- a/samples/mdi/makefile.vc +++ b/samples/mdi/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -MDI_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +MDI_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\mdi.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) MDI_OBJECTS = \ $(OBJS)\mdi_mdi.obj \ $(OBJS)\mdi_mdi.res diff --git a/samples/mdi/makefile.wat b/samples/mdi/makefile.wat index 215b0cb..b7793a2 100644 --- a/samples/mdi/makefile.wat +++ b/samples/mdi/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -MDI_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +MDI_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) MDI_OBJECTS = & $(OBJS)\mdi_mdi.obj OBJS = & diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in index c562687..2f3254a 100644 --- a/samples/memcheck/Makefile.in +++ b/samples/memcheck/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -MEMCHECK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +MEMCHECK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) MEMCHECK_OBJECTS = \ $(__memcheck_os2_lib_res) \ memcheck_memcheck.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o memcheck$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o memcheck$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ memcheck_memcheck.o: $(srcdir)/memcheck.cpp $(CXXC) -c -o $@ $(MEMCHECK_CXXFLAGS) $< memcheck_memcheck_rc.o: $(srcdir)/memcheck.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/memcheck/makefile.bcc b/samples/memcheck/makefile.bcc index bb89841..42b7a5b 100644 --- a/samples/memcheck/makefile.bcc +++ b/samples/memcheck/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -MEMCHECK_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +MEMCHECK_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) MEMCHECK_OBJECTS = \ $(OBJS)\memcheck_memcheck.obj OBJS = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\memcheck.ils del $(OBJS)\memcheck.ils $(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(MEMCHECK_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\memcheck_memcheck.res | diff --git a/samples/memcheck/makefile.gcc b/samples/memcheck/makefile.gcc index 7207ef1..30008c5 100644 --- a/samples/memcheck/makefile.gcc +++ b/samples/memcheck/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -MEMCHECK_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +MEMCHECK_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) MEMCHECK_OBJECTS = \ $(OBJS)\memcheck_memcheck.o \ $(OBJS)\memcheck_memcheck_rc.o diff --git a/samples/memcheck/makefile.vc b/samples/memcheck/makefile.vc index 55edcb2..c53e2b9 100644 --- a/samples/memcheck/makefile.vc +++ b/samples/memcheck/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -MEMCHECK_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\memcheck.pdb $(____DEBUGRUNTIME_2_p) \ +MEMCHECK_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\memcheck.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) MEMCHECK_OBJECTS = \ $(OBJS)\memcheck_memcheck.obj \ $(OBJS)\memcheck_memcheck.res diff --git a/samples/memcheck/makefile.wat b/samples/memcheck/makefile.wat index e6f38a5..bac34ee 100644 --- a/samples/memcheck/makefile.wat +++ b/samples/memcheck/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -MEMCHECK_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +MEMCHECK_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) MEMCHECK_OBJECTS = & $(OBJS)\memcheck_memcheck.obj OBJS = & diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in index 04ca833..ab7d98a 100644 --- a/samples/menu/Makefile.in +++ b/samples/menu/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -MENU_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +MENU_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) MENU_OBJECTS = \ $(__menu_os2_lib_res) \ menu_menu.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o menu$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o menu$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ menu_menu.o: $(srcdir)/menu.cpp $(CXXC) -c -o $@ $(MENU_CXXFLAGS) $< menu_menu_rc.o: $(srcdir)/menu.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/menu/makefile.bcc b/samples/menu/makefile.bcc index 1a58fe4..0122229 100644 --- a/samples/menu/makefile.bcc +++ b/samples/menu/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -MENU_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +MENU_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) MENU_OBJECTS = \ $(OBJS)\menu_menu.obj OBJS = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\menu.ils del $(OBJS)\menu.ils $(OBJS)\menu.exe: $(MENU_OBJECTS) $(OBJS)\menu_menu.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(MENU_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\menu_menu.res | diff --git a/samples/menu/makefile.gcc b/samples/menu/makefile.gcc index 8bf8c81..03c763c 100644 --- a/samples/menu/makefile.gcc +++ b/samples/menu/makefile.gcc @@ -12,11 +12,10 @@ include ../../build/msw/config.gcc ### Variables: ### -MENU_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +MENU_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) MENU_OBJECTS = \ $(OBJS)\menu_menu.o \ $(OBJS)\menu_menu_rc.o diff --git a/samples/menu/makefile.vc b/samples/menu/makefile.vc index e6a4146..7ee81d2 100644 --- a/samples/menu/makefile.vc +++ b/samples/menu/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -MENU_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +MENU_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\menu.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) MENU_OBJECTS = \ $(OBJS)\menu_menu.obj \ $(OBJS)\menu_menu.res diff --git a/samples/menu/makefile.wat b/samples/menu/makefile.wat index a771d8c..7ea137c 100644 --- a/samples/menu/makefile.wat +++ b/samples/menu/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -MENU_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +MENU_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) MENU_OBJECTS = & $(OBJS)\menu_menu.obj OBJS = & diff --git a/samples/mfc/Makefile.in b/samples/mfc/Makefile.in index 512f49f..143fc25 100644 --- a/samples/mfc/Makefile.in +++ b/samples/mfc/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -MFCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +MFCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) MFCTEST_OBJECTS = \ $(__mfctest_os2_lib_res) \ mfctest_mfctest.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o mfctest$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o mfctest$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ mfctest_mfctest.o: $(srcdir)/mfctest.cpp $(CXXC) -c -o $@ $(MFCTEST_CXXFLAGS) $< mfctest_mfctest_rc.o: $(srcdir)/mfctest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/mfc/makefile.bcc b/samples/mfc/makefile.bcc index 0a46174..ab04266 100644 --- a/samples/mfc/makefile.bcc +++ b/samples/mfc/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -MFCTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +MFCTEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) MFCTEST_OBJECTS = \ $(OBJS)\mfctest_mfctest.obj OBJS = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\mfctest.ils del $(OBJS)\mfctest.ils $(OBJS)\mfctest.exe: $(MFCTEST_OBJECTS) $(OBJS)\mfctest_mfctest.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(MFCTEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\mfctest_mfctest.res | diff --git a/samples/mfc/makefile.gcc b/samples/mfc/makefile.gcc index d5a3ef7..7c75e3f 100644 --- a/samples/mfc/makefile.gcc +++ b/samples/mfc/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -MFCTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +MFCTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) MFCTEST_OBJECTS = \ $(OBJS)\mfctest_mfctest.o \ $(OBJS)\mfctest_mfctest_rc.o diff --git a/samples/mfc/makefile.vc b/samples/mfc/makefile.vc index f49e26f..a459d68 100644 --- a/samples/mfc/makefile.vc +++ b/samples/mfc/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -MFCTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\mfctest.pdb $(____DEBUGRUNTIME_2_p) \ +MFCTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\mfctest.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) MFCTEST_OBJECTS = \ $(OBJS)\mfctest_mfctest.obj \ $(OBJS)\mfctest_mfctest.res diff --git a/samples/mfc/makefile.wat b/samples/mfc/makefile.wat index f98c4ae..5c569a8 100644 --- a/samples/mfc/makefile.wat +++ b/samples/mfc/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -MFCTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +MFCTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) MFCTEST_OBJECTS = & $(OBJS)\mfctest_mfctest.obj OBJS = & diff --git a/samples/minifram/Makefile.in b/samples/minifram/Makefile.in index 5731e41..83536e3 100644 --- a/samples/minifram/Makefile.in +++ b/samples/minifram/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -MINIFRAM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +MINIFRAM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) MINIFRAM_OBJECTS = \ $(__minifram_os2_lib_res) \ minifram_minifram.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o minifram$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o minifram$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ minifram_minifram.o: $(srcdir)/minifram.cpp $(CXXC) -c -o $@ $(MINIFRAM_CXXFLAGS) $< minifram_minifram_rc.o: $(srcdir)/minifram.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/minifram/makefile.bcc b/samples/minifram/makefile.bcc index 3bde3b3..7f9e58c 100644 --- a/samples/minifram/makefile.bcc +++ b/samples/minifram/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -MINIFRAM_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +MINIFRAM_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) MINIFRAM_OBJECTS = \ $(OBJS)\minifram_minifram.obj OBJS = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\minifram.ils del $(OBJS)\minifram.ils $(OBJS)\minifram.exe: $(MINIFRAM_OBJECTS) $(OBJS)\minifram_minifram.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(MINIFRAM_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\minifram_minifram.res | diff --git a/samples/minifram/makefile.gcc b/samples/minifram/makefile.gcc index ad2b668..68b7850 100644 --- a/samples/minifram/makefile.gcc +++ b/samples/minifram/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -MINIFRAM_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +MINIFRAM_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) MINIFRAM_OBJECTS = \ $(OBJS)\minifram_minifram.o \ $(OBJS)\minifram_minifram_rc.o diff --git a/samples/minifram/makefile.vc b/samples/minifram/makefile.vc index ad39321..deed20c 100644 --- a/samples/minifram/makefile.vc +++ b/samples/minifram/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -MINIFRAM_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\minifram.pdb $(____DEBUGRUNTIME_2_p) \ +MINIFRAM_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\minifram.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) MINIFRAM_OBJECTS = \ $(OBJS)\minifram_minifram.obj \ $(OBJS)\minifram_minifram.res diff --git a/samples/minifram/makefile.wat b/samples/minifram/makefile.wat index 30974b2..c961e7a 100644 --- a/samples/minifram/makefile.wat +++ b/samples/minifram/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -MINIFRAM_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +MINIFRAM_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) MINIFRAM_OBJECTS = & $(OBJS)\minifram_minifram.obj OBJS = & diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in index 5fa7f4f..965143f 100644 --- a/samples/minimal/Makefile.in +++ b/samples/minimal/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -MINIMAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +MINIMAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) MINIMAL_OBJECTS = \ $(__minimal___win32rc) \ $(__minimal_os2_lib_res) \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o minimal$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o minimal$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ minimal_minimal.o: $(srcdir)/minimal.cpp $(CXXC) -c -o $@ $(MINIMAL_CXXFLAGS) $< minimal_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/minimal/makefile.bcc b/samples/minimal/makefile.bcc index fdbe9a8..417e50e 100644 --- a/samples/minimal/makefile.bcc +++ b/samples/minimal/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -MINIMAL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +MINIMAL_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) MINIMAL_OBJECTS = \ $(OBJS)\minimal_minimal.obj OBJS = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\minimal.ils del $(OBJS)\minimal.ils $(OBJS)\minimal.exe: $(MINIMAL_OBJECTS) $(OBJS)\minimal_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(MINIMAL_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\minimal_sample.res | diff --git a/samples/minimal/makefile.gcc b/samples/minimal/makefile.gcc index d70e47f..b4dd023 100644 --- a/samples/minimal/makefile.gcc +++ b/samples/minimal/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -MINIMAL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +MINIMAL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) MINIMAL_OBJECTS = \ $(OBJS)\minimal_sample_rc.o \ $(OBJS)\minimal_minimal.o diff --git a/samples/minimal/makefile.vc b/samples/minimal/makefile.vc index 01bdc81..7af023a 100644 --- a/samples/minimal/makefile.vc +++ b/samples/minimal/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -MINIMAL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\minimal.pdb $(____DEBUGRUNTIME_2_p) \ +MINIMAL_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\minimal.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) MINIMAL_OBJECTS = \ $(OBJS)\minimal_sample.res \ $(OBJS)\minimal_minimal.obj diff --git a/samples/minimal/makefile.wat b/samples/minimal/makefile.wat index 85e2ec9..e3fff5e 100644 --- a/samples/minimal/makefile.wat +++ b/samples/minimal/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -MINIMAL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +MINIMAL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) MINIMAL_OBJECTS = & $(OBJS)\minimal_minimal.obj OBJS = & diff --git a/samples/mobile/makefile.bcc b/samples/mobile/makefile.bcc index 7e1ba21..74dbec5 100644 --- a/samples/mobile/makefile.bcc +++ b/samples/mobile/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,10 +19,6 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### MAKEARGS = -DCPPFLAGS="$(CPPFLAGS)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \ diff --git a/samples/mobile/styles/Makefile.in b/samples/mobile/styles/Makefile.in index e826047..04a2045 100644 --- a/samples/mobile/styles/Makefile.in +++ b/samples/mobile/styles/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -STYLES_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) +STYLES_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) STYLES_OBJECTS = \ $(__styles___win32rc) \ $(__styles_os2_lib_res) \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o styles$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -o styles$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -159,7 +158,7 @@ styles.app/Contents/PkgInfo: styles$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in @COND_PLATFORM_MACOSX_1@styles_bundle: styles.app/Contents/PkgInfo styles_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples styles_styles.o: $(srcdir)/styles.cpp $(CXXC) -c -o $@ $(STYLES_CXXFLAGS) $< diff --git a/samples/mobile/styles/makefile.bcc b/samples/mobile/styles/makefile.bcc index d9fb71b..7b75d8a 100644 --- a/samples/mobile/styles/makefile.bcc +++ b/samples/mobile/styles/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,17 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STYLES_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +STYLES_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) + -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CPPFLAGS) \ + $(CXXFLAGS) STYLES_OBJECTS = \ $(OBJS)\styles_styles.obj @@ -174,6 +176,6 @@ data: for %f in (marble.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\styles.exe: $(STYLES_OBJECTS) $(OBJS)\styles_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(STYLES_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\styles_sample.res | diff --git a/samples/mobile/styles/makefile.gcc b/samples/mobile/styles/makefile.gcc index 8ea5ecb..1721a01 100644 --- a/samples/mobile/styles/makefile.gcc +++ b/samples/mobile/styles/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STYLES_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +STYLES_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) STYLES_OBJECTS = \ $(OBJS)\styles_sample_rc.o \ $(OBJS)\styles_styles.o diff --git a/samples/mobile/styles/makefile.vc b/samples/mobile/styles/makefile.vc index 57ab450..1eadf13d 100644 --- a/samples/mobile/styles/makefile.vc +++ b/samples/mobile/styles/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STYLES_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +STYLES_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\styles.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) STYLES_OBJECTS = \ $(OBJS)\styles_sample.res \ $(OBJS)\styles_styles.obj diff --git a/samples/mobile/styles/makefile.wat b/samples/mobile/styles/makefile.wat index b57dbff..36aac75 100644 --- a/samples/mobile/styles/makefile.wat +++ b/samples/mobile/styles/makefile.wat @@ -171,10 +171,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STYLES_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +STYLES_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) STYLES_OBJECTS = & $(OBJS)\styles_styles.obj diff --git a/samples/mobile/wxedit/Makefile.in b/samples/mobile/wxedit/Makefile.in index 1805494..f61a1a0 100644 --- a/samples/mobile/wxedit/Makefile.in +++ b/samples/mobile/wxedit/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WXEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) +WXEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) WXEDIT_OBJECTS = \ $(__wxedit___win32rc) \ $(__wxedit_os2_lib_res) \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o wxedit$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -o wxedit$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -153,7 +152,7 @@ wxedit.app/Contents/PkgInfo: wxedit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in @COND_PLATFORM_MACOSX_1@wxedit_bundle: wxedit.app/Contents/PkgInfo wxedit_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples wxedit_wxedit.o: $(srcdir)/wxedit.cpp $(CXXC) -c -o $@ $(WXEDIT_CXXFLAGS) $< diff --git a/samples/mobile/wxedit/makefile.bcc b/samples/mobile/wxedit/makefile.bcc index a41fa79..6d39b18 100644 --- a/samples/mobile/wxedit/makefile.bcc +++ b/samples/mobile/wxedit/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,17 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXEDIT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +WXEDIT_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) + -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CPPFLAGS) \ + $(CXXFLAGS) WXEDIT_OBJECTS = \ $(OBJS)\wxedit_wxedit.obj @@ -170,6 +172,6 @@ clean: -if exist $(OBJS)\wxedit.ils del $(OBJS)\wxedit.ils $(OBJS)\wxedit.exe: $(WXEDIT_OBJECTS) $(OBJS)\wxedit_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(WXEDIT_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\wxedit_sample.res | diff --git a/samples/mobile/wxedit/makefile.gcc b/samples/mobile/wxedit/makefile.gcc index 76ccf29..2d422db 100644 --- a/samples/mobile/wxedit/makefile.gcc +++ b/samples/mobile/wxedit/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXEDIT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +WXEDIT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) WXEDIT_OBJECTS = \ $(OBJS)\wxedit_sample_rc.o \ $(OBJS)\wxedit_wxedit.o diff --git a/samples/mobile/wxedit/makefile.vc b/samples/mobile/wxedit/makefile.vc index 661a630..744806b 100644 --- a/samples/mobile/wxedit/makefile.vc +++ b/samples/mobile/wxedit/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXEDIT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +WXEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\wxedit.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) WXEDIT_OBJECTS = \ $(OBJS)\wxedit_sample.res \ $(OBJS)\wxedit_wxedit.obj diff --git a/samples/mobile/wxedit/makefile.wat b/samples/mobile/wxedit/makefile.wat index 1dda8bd..fd8d10a 100644 --- a/samples/mobile/wxedit/makefile.wat +++ b/samples/mobile/wxedit/makefile.wat @@ -171,10 +171,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXEDIT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +WXEDIT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) WXEDIT_OBJECTS = & $(OBJS)\wxedit_wxedit.obj diff --git a/samples/multimon/Makefile.in b/samples/multimon/Makefile.in index 934bf59..79ed5e0 100644 --- a/samples/multimon/Makefile.in +++ b/samples/multimon/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -MULTIMON_TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +MULTIMON_TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) MULTIMON_TEST_OBJECTS = \ $(__multimon_test___win32rc) \ $(__multimon_test_os2_lib_res) \ @@ -77,9 +76,9 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o multimon_test$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o multimon_test$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -158,7 +157,7 @@ multimon_test_multimon_test.o: $(srcdir)/multimon_test.cpp $(CXXC) -c -o $@ $(MULTIMON_TEST_CXXFLAGS) $< multimon_test_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/multimon/makefile.bcc b/samples/multimon/makefile.bcc index fe891d7..76e59b4 100644 --- a/samples/multimon/makefile.bcc +++ b/samples/multimon/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -MULTIMON_TEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ +MULTIMON_TEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) MULTIMON_TEST_OBJECTS = \ $(OBJS)\multimon_test_multimon_test.obj OBJS = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\multimon_test.ils del $(OBJS)\multimon_test.ils $(OBJS)\multimon_test.exe: $(MULTIMON_TEST_OBJECTS) $(OBJS)\multimon_test_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(MULTIMON_TEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\multimon_test_sample.res | diff --git a/samples/multimon/makefile.gcc b/samples/multimon/makefile.gcc index 3144be5..7013b66 100644 --- a/samples/multimon/makefile.gcc +++ b/samples/multimon/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -MULTIMON_TEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +MULTIMON_TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) MULTIMON_TEST_OBJECTS = \ $(OBJS)\multimon_test_sample_rc.o \ $(OBJS)\multimon_test_multimon_test.o diff --git a/samples/multimon/makefile.vc b/samples/multimon/makefile.vc index 270c68e..0248217 100644 --- a/samples/multimon/makefile.vc +++ b/samples/multimon/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -MULTIMON_TEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\multimon_test.pdb \ - $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - /I.\..\..\include /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ - /I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) +MULTIMON_TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\multimon_test.pdb $(____DEBUGRUNTIME_2_p) \ + $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) MULTIMON_TEST_OBJECTS = \ $(OBJS)\multimon_test_sample.res \ $(OBJS)\multimon_test_multimon_test.obj diff --git a/samples/multimon/makefile.wat b/samples/multimon/makefile.wat index e7ce865..ff76df5 100644 --- a/samples/multimon/makefile.wat +++ b/samples/multimon/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -MULTIMON_TEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +MULTIMON_TEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) MULTIMON_TEST_OBJECTS = & $(OBJS)\multimon_test_multimon_test.obj OBJS = & diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in index fada6e7..634fc5f 100644 --- a/samples/nativdlg/Makefile.in +++ b/samples/nativdlg/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -NATIVDLG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +NATIVDLG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) NATIVDLG_OBJECTS = \ $(__nativdlg_os2_lib_res) \ nativdlg_nativdlg.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o nativdlg$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o nativdlg$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ nativdlg_nativdlg.o: $(srcdir)/nativdlg.cpp $(CXXC) -c -o $@ $(NATIVDLG_CXXFLAGS) $< nativdlg_nativdlg_rc.o: $(srcdir)/nativdlg.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/nativdlg/makefile.bcc b/samples/nativdlg/makefile.bcc index 193b730..26dd80c 100644 --- a/samples/nativdlg/makefile.bcc +++ b/samples/nativdlg/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -NATIVDLG_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +NATIVDLG_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) NATIVDLG_OBJECTS = \ $(OBJS)\nativdlg_nativdlg.obj OBJS = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\nativdlg.ils del $(OBJS)\nativdlg.ils $(OBJS)\nativdlg.exe: $(NATIVDLG_OBJECTS) $(OBJS)\nativdlg_nativdlg.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(NATIVDLG_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\nativdlg_nativdlg.res | diff --git a/samples/nativdlg/makefile.gcc b/samples/nativdlg/makefile.gcc index be76da7..33fee18 100644 --- a/samples/nativdlg/makefile.gcc +++ b/samples/nativdlg/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -NATIVDLG_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +NATIVDLG_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) NATIVDLG_OBJECTS = \ $(OBJS)\nativdlg_nativdlg.o \ $(OBJS)\nativdlg_nativdlg_rc.o diff --git a/samples/nativdlg/makefile.vc b/samples/nativdlg/makefile.vc index 653d9a3..9d0d44c 100644 --- a/samples/nativdlg/makefile.vc +++ b/samples/nativdlg/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -NATIVDLG_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\nativdlg.pdb $(____DEBUGRUNTIME_2_p) \ +NATIVDLG_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\nativdlg.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) NATIVDLG_OBJECTS = \ $(OBJS)\nativdlg_nativdlg.obj \ $(OBJS)\nativdlg_nativdlg.res diff --git a/samples/nativdlg/makefile.wat b/samples/nativdlg/makefile.wat index da07c91..f4c6e77 100644 --- a/samples/nativdlg/makefile.wat +++ b/samples/nativdlg/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -NATIVDLG_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +NATIVDLG_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) NATIVDLG_OBJECTS = & $(OBJS)\nativdlg_nativdlg.obj OBJS = & diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in index b364c3e..8c48cd3 100644 --- a/samples/notebook/Makefile.in +++ b/samples/notebook/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -NOTEBOOK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +NOTEBOOK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) NOTEBOOK_OBJECTS = \ $(__notebook_os2_lib_res) \ notebook_notebook.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o notebook$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o notebook$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ notebook_notebook.o: $(srcdir)/notebook.cpp $(CXXC) -c -o $@ $(NOTEBOOK_CXXFLAGS) $< notebook_notebook_rc.o: $(srcdir)/notebook.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/notebook/makefile.bcc b/samples/notebook/makefile.bcc index 5f0b834..7846bb5 100644 --- a/samples/notebook/makefile.bcc +++ b/samples/notebook/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -NOTEBOOK_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +NOTEBOOK_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) NOTEBOOK_OBJECTS = \ $(OBJS)\notebook_notebook.obj OBJS = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\notebook.ils del $(OBJS)\notebook.ils $(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_notebook.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(NOTEBOOK_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\notebook_notebook.res | diff --git a/samples/notebook/makefile.gcc b/samples/notebook/makefile.gcc index 4ea0994..c8c1baa 100644 --- a/samples/notebook/makefile.gcc +++ b/samples/notebook/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -NOTEBOOK_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +NOTEBOOK_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) NOTEBOOK_OBJECTS = \ $(OBJS)\notebook_notebook.o \ $(OBJS)\notebook_notebook_rc.o diff --git a/samples/notebook/makefile.vc b/samples/notebook/makefile.vc index 57c9970..d5f28a3 100644 --- a/samples/notebook/makefile.vc +++ b/samples/notebook/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -NOTEBOOK_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\notebook.pdb $(____DEBUGRUNTIME_2_p) \ +NOTEBOOK_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\notebook.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) NOTEBOOK_OBJECTS = \ $(OBJS)\notebook_notebook.obj \ $(OBJS)\notebook_notebook.res diff --git a/samples/notebook/makefile.wat b/samples/notebook/makefile.wat index e809590..a641490 100644 --- a/samples/notebook/makefile.wat +++ b/samples/notebook/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -NOTEBOOK_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +NOTEBOOK_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) NOTEBOOK_OBJECTS = & $(OBJS)\notebook_notebook.obj OBJS = & diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in index e137e3f..9ca41e7 100644 --- a/samples/oleauto/Makefile.in +++ b/samples/oleauto/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -OLEAUTO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +OLEAUTO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) OLEAUTO_OBJECTS = \ $(__oleauto_os2_lib_res) \ oleauto_oleauto.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o oleauto$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o oleauto$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ oleauto_oleauto.o: $(srcdir)/oleauto.cpp $(CXXC) -c -o $@ $(OLEAUTO_CXXFLAGS) $< oleauto_oleauto_rc.o: $(srcdir)/oleauto.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/oleauto/makefile.bcc b/samples/oleauto/makefile.bcc index 15d373e..667b977 100644 --- a/samples/oleauto/makefile.bcc +++ b/samples/oleauto/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,18 +19,14 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OLEAUTO_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +OLEAUTO_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) OLEAUTO_OBJECTS = \ $(OBJS)\oleauto_oleauto.obj SETUPHDIR = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\oleauto.ils del $(OBJS)\oleauto.ils $(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(OLEAUTO_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\oleauto_oleauto.res | diff --git a/samples/oleauto/makefile.gcc b/samples/oleauto/makefile.gcc index 237d1e8..ae508d9 100644 --- a/samples/oleauto/makefile.gcc +++ b/samples/oleauto/makefile.gcc @@ -14,11 +14,11 @@ include ../../build/msw/config.gcc OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OLEAUTO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +OLEAUTO_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) OLEAUTO_OBJECTS = \ $(OBJS)\oleauto_oleauto.o \ $(OBJS)\oleauto_oleauto_rc.o diff --git a/samples/oleauto/makefile.vc b/samples/oleauto/makefile.vc index 2f54199..450eaa2 100644 --- a/samples/oleauto/makefile.vc +++ b/samples/oleauto/makefile.vc @@ -14,12 +14,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OLEAUTO_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\oleauto.pdb $(____DEBUGRUNTIME_2_p) \ +OLEAUTO_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\oleauto.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) OLEAUTO_OBJECTS = \ $(OBJS)\oleauto_oleauto.obj \ $(OBJS)\oleauto_oleauto.res diff --git a/samples/oleauto/makefile.wat b/samples/oleauto/makefile.wat index 04679f6..6c6acf5 100644 --- a/samples/oleauto/makefile.wat +++ b/samples/oleauto/makefile.wat @@ -169,10 +169,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OLEAUTO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +OLEAUTO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) OLEAUTO_OBJECTS = & $(OBJS)\oleauto_oleauto.obj SETUPHDIR = & diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in index 604af34..771f225 100644 --- a/samples/opengl/cube/Makefile.in +++ b/samples/opengl/cube/Makefile.in @@ -35,9 +35,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CUBE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) +CUBE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) CUBE_OBJECTS = \ $(__cube_os2_lib_res) \ cube_cube.o \ @@ -78,8 +77,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o cube$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -o cube$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -148,7 +147,7 @@ cube_cube.o: $(srcdir)/cube.cpp $(CXXC) -c -o $@ $(CUBE_CXXFLAGS) $< cube_cube_rc.o: $(srcdir)/cube.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile diff --git a/samples/opengl/cube/makefile.bcc b/samples/opengl/cube/makefile.bcc index fc376ba..c62701e 100644 --- a/samples/opengl/cube/makefile.bcc +++ b/samples/opengl/cube/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,13 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -CUBE_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +CUBE_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) + -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CPPFLAGS) \ + $(CXXFLAGS) CUBE_OBJECTS = \ $(OBJS)\cube_cube.obj OBJS = \ @@ -170,6 +172,6 @@ clean: -if exist $(OBJS)\cube.ils del $(OBJS)\cube.ils $(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_cube.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(CUBE_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\cube_cube.res | diff --git a/samples/opengl/cube/makefile.gcc b/samples/opengl/cube/makefile.gcc index 65c2a02..9a7be55 100644 --- a/samples/opengl/cube/makefile.gcc +++ b/samples/opengl/cube/makefile.gcc @@ -12,11 +12,11 @@ include ../../../build/msw/config.gcc ### Variables: ### -CUBE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +CUBE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) \ + -I.\..\..\..\samples $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) \ + $(CPPFLAGS) $(CXXFLAGS) CUBE_OBJECTS = \ $(OBJS)\cube_cube.o \ $(OBJS)\cube_cube_rc.o diff --git a/samples/opengl/cube/makefile.vc b/samples/opengl/cube/makefile.vc index dcaab95..25c617b 100644 --- a/samples/opengl/cube/makefile.vc +++ b/samples/opengl/cube/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -CUBE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +CUBE_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\cube.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) CUBE_OBJECTS = \ $(OBJS)\cube_cube.obj \ $(OBJS)\cube_cube.res diff --git a/samples/opengl/cube/makefile.wat b/samples/opengl/cube/makefile.wat index 09ca065..f4749e4 100644 --- a/samples/opengl/cube/makefile.wat +++ b/samples/opengl/cube/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -CUBE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +CUBE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) CUBE_OBJECTS = & $(OBJS)\cube_cube.obj OBJS = & diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in index 09149ad..006375b 100644 --- a/samples/opengl/isosurf/Makefile.in +++ b/samples/opengl/isosurf/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -ISOSURF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) +ISOSURF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) ISOSURF_OBJECTS = \ $(__isosurf___win32rc) \ $(__isosurf_os2_lib_res) \ @@ -78,8 +77,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o isosurf$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -o isosurf$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -163,7 +162,7 @@ isosurf_isosurf.o: $(srcdir)/isosurf.cpp $(CXXC) -c -o $@ $(ISOSURF_CXXFLAGS) $< isosurf_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples uninstall: diff --git a/samples/opengl/isosurf/makefile.bcc b/samples/opengl/isosurf/makefile.bcc index 15f12c8..03f5f76 100644 --- a/samples/opengl/isosurf/makefile.bcc +++ b/samples/opengl/isosurf/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,13 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -ISOSURF_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +ISOSURF_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) + -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CPPFLAGS) \ + $(CXXFLAGS) ISOSURF_OBJECTS = \ $(OBJS)\isosurf_isosurf.obj OBJS = \ @@ -174,6 +176,6 @@ data: for %f in (isosurf.dat.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\isosurf.exe: $(ISOSURF_OBJECTS) $(OBJS)\isosurf_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(ISOSURF_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\isosurf_sample.res | diff --git a/samples/opengl/isosurf/makefile.gcc b/samples/opengl/isosurf/makefile.gcc index 083a665..b45ad82 100644 --- a/samples/opengl/isosurf/makefile.gcc +++ b/samples/opengl/isosurf/makefile.gcc @@ -12,11 +12,11 @@ include ../../../build/msw/config.gcc ### Variables: ### -ISOSURF_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +ISOSURF_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) ISOSURF_OBJECTS = \ $(OBJS)\isosurf_sample_rc.o \ $(OBJS)\isosurf_isosurf.o diff --git a/samples/opengl/isosurf/makefile.vc b/samples/opengl/isosurf/makefile.vc index ee98d26..13b4228 100644 --- a/samples/opengl/isosurf/makefile.vc +++ b/samples/opengl/isosurf/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -ISOSURF_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\isosurf.pdb $(____DEBUGRUNTIME_2_p) \ +ISOSURF_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\isosurf.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) ISOSURF_OBJECTS = \ $(OBJS)\isosurf_sample.res \ $(OBJS)\isosurf_isosurf.obj diff --git a/samples/opengl/isosurf/makefile.wat b/samples/opengl/isosurf/makefile.wat index 47d0b15..7535650 100644 --- a/samples/opengl/isosurf/makefile.wat +++ b/samples/opengl/isosurf/makefile.wat @@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -ISOSURF_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +ISOSURF_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) ISOSURF_OBJECTS = & $(OBJS)\isosurf_isosurf.obj OBJS = & diff --git a/samples/opengl/makefile.bcc b/samples/opengl/makefile.bcc index 63ec5d1..6b48870 100644 --- a/samples/opengl/makefile.bcc +++ b/samples/opengl/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,10 +19,6 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### MAKEARGS = -DCPPFLAGS="$(CPPFLAGS)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \ diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in index 0732d09..9ed76f1 100644 --- a/samples/opengl/penguin/Makefile.in +++ b/samples/opengl/penguin/Makefile.in @@ -39,12 +39,10 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -PENGUIN_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CPPFLAGS) $(CFLAGS) -PENGUIN_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) +PENGUIN_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CFLAGS) +PENGUIN_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) PENGUIN_OBJECTS = \ $(__penguin_os2_lib_res) \ penguin_penguin.o \ @@ -87,8 +85,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o penguin$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -o penguin$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -175,7 +173,7 @@ penguin_penguin.o: $(srcdir)/penguin.cpp $(CXXC) -c -o $@ $(PENGUIN_CXXFLAGS) $< penguin_penguin_rc.o: $(srcdir)/penguin.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples penguin_trackball.o: $(srcdir)/trackball.c $(CCC) -c -o $@ $(PENGUIN_CFLAGS) $< diff --git a/samples/opengl/penguin/makefile.bcc b/samples/opengl/penguin/makefile.bcc index 0ce3e7f..3a9c8e3 100644 --- a/samples/opengl/penguin/makefile.bcc +++ b/samples/opengl/penguin/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,22 +19,19 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PENGUIN_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +PENGUIN_CFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CFLAGS) -PENGUIN_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CPPFLAGS) $(CFLAGS) +PENGUIN_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) + -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CPPFLAGS) \ + $(CXXFLAGS) PENGUIN_OBJECTS = \ $(OBJS)\penguin_penguin.obj \ $(OBJS)\penguin_lw.obj \ @@ -186,6 +188,6 @@ data: for %f in (penguin.lwo) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(PENGUIN_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\penguin_penguin.res | diff --git a/samples/opengl/penguin/makefile.gcc b/samples/opengl/penguin/makefile.gcc index 81ed4e4..01ff8be 100644 --- a/samples/opengl/penguin/makefile.gcc +++ b/samples/opengl/penguin/makefile.gcc @@ -14,15 +14,15 @@ include ../../../build/msw/config.gcc OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PENGUIN_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +PENGUIN_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) \ + -I.\..\..\..\samples $(CPPFLAGS) $(CFLAGS) +PENGUIN_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples $(CFLAGS) -PENGUIN_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) PENGUIN_OBJECTS = \ $(OBJS)\penguin_penguin.o \ $(OBJS)\penguin_lw.o \ diff --git a/samples/opengl/penguin/makefile.vc b/samples/opengl/penguin/makefile.vc index b576c13..58c7ef1 100644 --- a/samples/opengl/penguin/makefile.vc +++ b/samples/opengl/penguin/makefile.vc @@ -14,18 +14,18 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PENGUIN_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +PENGUIN_CFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\penguin.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - $(CFLAGS) -PENGUIN_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\penguin.pdb $(____DEBUGRUNTIME_2_p) \ + $(CPPFLAGS) $(CFLAGS) +PENGUIN_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\penguin.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) PENGUIN_OBJECTS = \ $(OBJS)\penguin_penguin.obj \ $(OBJS)\penguin_lw.obj \ diff --git a/samples/opengl/penguin/makefile.wat b/samples/opengl/penguin/makefile.wat index 287e9c7..c603272 100644 --- a/samples/opengl/penguin/makefile.wat +++ b/samples/opengl/penguin/makefile.wat @@ -169,14 +169,14 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PENGUIN_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples $(CFLAGS) -PENGUIN_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +PENGUIN_CFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples $(CPPFLAGS) $(CFLAGS) +PENGUIN_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) PENGUIN_OBJECTS = & $(OBJS)\penguin_penguin.obj & $(OBJS)\penguin_lw.obj & diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in index caa3221..d3d6881 100644 --- a/samples/ownerdrw/Makefile.in +++ b/samples/ownerdrw/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -OWNERDRW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +OWNERDRW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) OWNERDRW_OBJECTS = \ $(__ownerdrw_os2_lib_res) \ ownerdrw_ownerdrw.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o ownerdrw$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o ownerdrw$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -162,7 +161,7 @@ ownerdrw_ownerdrw.o: $(srcdir)/ownerdrw.cpp $(CXXC) -c -o $@ $(OWNERDRW_CXXFLAGS) $< ownerdrw_ownerdrw_rc.o: $(srcdir)/ownerdrw.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/ownerdrw/makefile.bcc b/samples/ownerdrw/makefile.bcc index 19a66e5..f904d7d 100644 --- a/samples/ownerdrw/makefile.bcc +++ b/samples/ownerdrw/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,18 +19,14 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OWNERDRW_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +OWNERDRW_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) OWNERDRW_OBJECTS = \ $(OBJS)\ownerdrw_ownerdrw.obj SETUPHDIR = \ @@ -174,6 +175,6 @@ data: for %f in (sound.png nosound.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\ownerdrw.exe: $(OWNERDRW_OBJECTS) $(OBJS)\ownerdrw_ownerdrw.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(OWNERDRW_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\ownerdrw_ownerdrw.res | diff --git a/samples/ownerdrw/makefile.gcc b/samples/ownerdrw/makefile.gcc index 9b076ed..cf754b3 100644 --- a/samples/ownerdrw/makefile.gcc +++ b/samples/ownerdrw/makefile.gcc @@ -14,11 +14,11 @@ include ../../build/msw/config.gcc OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OWNERDRW_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +OWNERDRW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) OWNERDRW_OBJECTS = \ $(OBJS)\ownerdrw_ownerdrw.o \ $(OBJS)\ownerdrw_ownerdrw_rc.o diff --git a/samples/ownerdrw/makefile.vc b/samples/ownerdrw/makefile.vc index ec203d4..1dd2c80 100644 --- a/samples/ownerdrw/makefile.vc +++ b/samples/ownerdrw/makefile.vc @@ -14,12 +14,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OWNERDRW_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\ownerdrw.pdb $(____DEBUGRUNTIME_2_p) \ +OWNERDRW_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\ownerdrw.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) OWNERDRW_OBJECTS = \ $(OBJS)\ownerdrw_ownerdrw.obj \ $(OBJS)\ownerdrw_ownerdrw.res diff --git a/samples/ownerdrw/makefile.wat b/samples/ownerdrw/makefile.wat index 0e0544d..df878f5 100644 --- a/samples/ownerdrw/makefile.wat +++ b/samples/ownerdrw/makefile.wat @@ -169,10 +169,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OWNERDRW_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +OWNERDRW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) OWNERDRW_OBJECTS = & $(OBJS)\ownerdrw_ownerdrw.obj SETUPHDIR = & diff --git a/samples/png/Makefile.in b/samples/png/Makefile.in index 4d6d045..1c12d2c 100644 --- a/samples/png/Makefile.in +++ b/samples/png/Makefile.in @@ -36,8 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -PNG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \ - -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +PNG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) PNG_OBJECTS = \ $(__png_os2_lib_res) \ png_pngdemo.o \ @@ -76,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o png$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o png$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -152,7 +152,7 @@ png_pngdemo.o: $(srcdir)/pngdemo.cpp $(CXXC) -c -o $@ $(PNG_CXXFLAGS) $< png_pngdemo_rc.o: $(srcdir)/pngdemo.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/png/makefile.bcc b/samples/png/makefile.bcc index ab93252..e174385 100644 --- a/samples/png/makefile.bcc +++ b/samples/png/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,18 +19,14 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PNG_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +PNG_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) PNG_OBJECTS = \ $(OBJS)\png_pngdemo.obj SETUPHDIR = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\png.ils del $(OBJS)\png.ils $(OBJS)\png.exe: $(PNG_OBJECTS) $(OBJS)\png_pngdemo.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(PNG_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\png_pngdemo.res | diff --git a/samples/png/makefile.gcc b/samples/png/makefile.gcc index 7c68cb9..c6c86b2 100644 --- a/samples/png/makefile.gcc +++ b/samples/png/makefile.gcc @@ -14,11 +14,10 @@ include ../../build/msw/config.gcc OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PNG_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +PNG_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) PNG_OBJECTS = \ $(OBJS)\png_pngdemo.o \ $(OBJS)\png_pngdemo_rc.o diff --git a/samples/png/makefile.vc b/samples/png/makefile.vc index a8bd118..380e253 100644 --- a/samples/png/makefile.vc +++ b/samples/png/makefile.vc @@ -14,12 +14,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PNG_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +PNG_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\png.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) PNG_OBJECTS = \ $(OBJS)\png_pngdemo.obj \ $(OBJS)\png_pngdemo.res diff --git a/samples/png/makefile.wat b/samples/png/makefile.wat index 4cc669c..2c3c9ba 100644 --- a/samples/png/makefile.wat +++ b/samples/png/makefile.wat @@ -169,10 +169,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PNG_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +PNG_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) PNG_OBJECTS = & $(OBJS)\png_pngdemo.obj SETUPHDIR = & diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in index db9ed0b..a3114be 100644 --- a/samples/printing/Makefile.in +++ b/samples/printing/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -PRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +PRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) PRINTING_OBJECTS = \ $(__printing_os2_lib_res) \ printing_printing.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o printing$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o printing$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ printing_printing.o: $(srcdir)/printing.cpp $(CXXC) -c -o $@ $(PRINTING_CXXFLAGS) $< printing_printing_rc.o: $(srcdir)/printing.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/printing/makefile.bcc b/samples/printing/makefile.bcc index cd0608e..8ae6231 100644 --- a/samples/printing/makefile.bcc +++ b/samples/printing/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,18 +19,14 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PRINTING_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +PRINTING_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) PRINTING_OBJECTS = \ $(OBJS)\printing_printing.obj SETUPHDIR = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\printing.ils del $(OBJS)\printing.ils $(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(PRINTING_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\printing_printing.res | diff --git a/samples/printing/makefile.gcc b/samples/printing/makefile.gcc index 1048561..4a55bb7 100644 --- a/samples/printing/makefile.gcc +++ b/samples/printing/makefile.gcc @@ -14,11 +14,11 @@ include ../../build/msw/config.gcc OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PRINTING_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +PRINTING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) PRINTING_OBJECTS = \ $(OBJS)\printing_printing.o \ $(OBJS)\printing_printing_rc.o diff --git a/samples/printing/makefile.vc b/samples/printing/makefile.vc index d118999..f00539f 100644 --- a/samples/printing/makefile.vc +++ b/samples/printing/makefile.vc @@ -14,12 +14,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PRINTING_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\printing.pdb $(____DEBUGRUNTIME_2_p) \ +PRINTING_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\printing.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) PRINTING_OBJECTS = \ $(OBJS)\printing_printing.obj \ $(OBJS)\printing_printing.res diff --git a/samples/printing/makefile.wat b/samples/printing/makefile.wat index d787b53..b1d06e9 100644 --- a/samples/printing/makefile.wat +++ b/samples/printing/makefile.wat @@ -169,10 +169,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PRINTING_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +PRINTING_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) PRINTING_OBJECTS = & $(OBJS)\printing_printing.obj SETUPHDIR = & diff --git a/samples/propsize/Makefile.in b/samples/propsize/Makefile.in index 10deca3..2a8f985 100644 --- a/samples/propsize/Makefile.in +++ b/samples/propsize/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -PROPSIZE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +PROPSIZE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) PROPSIZE_OBJECTS = \ $(__propsize_os2_lib_res) \ propsize_propsize.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o propsize$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o propsize$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ propsize_propsize.o: $(srcdir)/propsize.cpp $(CXXC) -c -o $@ $(PROPSIZE_CXXFLAGS) $< propsize_propsize_rc.o: $(srcdir)/propsize.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/propsize/makefile.bcc b/samples/propsize/makefile.bcc index ffce3cc..8187dd4 100644 --- a/samples/propsize/makefile.bcc +++ b/samples/propsize/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,18 +19,14 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PROPSIZE_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +PROPSIZE_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) PROPSIZE_OBJECTS = \ $(OBJS)\propsize_propsize.obj SETUPHDIR = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\propsize.ils del $(OBJS)\propsize.ils $(OBJS)\propsize.exe: $(PROPSIZE_OBJECTS) $(OBJS)\propsize_propsize.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(PROPSIZE_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\propsize_propsize.res | diff --git a/samples/propsize/makefile.gcc b/samples/propsize/makefile.gcc index c9db08f..f9f2b63 100644 --- a/samples/propsize/makefile.gcc +++ b/samples/propsize/makefile.gcc @@ -14,11 +14,11 @@ include ../../build/msw/config.gcc OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PROPSIZE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +PROPSIZE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) PROPSIZE_OBJECTS = \ $(OBJS)\propsize_propsize.o \ $(OBJS)\propsize_propsize_rc.o diff --git a/samples/propsize/makefile.vc b/samples/propsize/makefile.vc index 31bde1a..c452105 100644 --- a/samples/propsize/makefile.vc +++ b/samples/propsize/makefile.vc @@ -14,12 +14,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PROPSIZE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\propsize.pdb $(____DEBUGRUNTIME_2_p) \ +PROPSIZE_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\propsize.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) PROPSIZE_OBJECTS = \ $(OBJS)\propsize_propsize.obj \ $(OBJS)\propsize_propsize.res diff --git a/samples/propsize/makefile.wat b/samples/propsize/makefile.wat index 6fc7f5d..b95b344 100644 --- a/samples/propsize/makefile.wat +++ b/samples/propsize/makefile.wat @@ -169,10 +169,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PROPSIZE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +PROPSIZE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) PROPSIZE_OBJECTS = & $(OBJS)\propsize_propsize.obj SETUPHDIR = & diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in index dcc342c..10c5c78 100644 --- a/samples/regtest/Makefile.in +++ b/samples/regtest/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -REGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +REGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) REGTEST_OBJECTS = \ $(__regtest_os2_lib_res) \ regtest_regtest.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o regtest$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o regtest$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ regtest_regtest.o: $(srcdir)/regtest.cpp $(CXXC) -c -o $@ $(REGTEST_CXXFLAGS) $< regtest_regtest_rc.o: $(srcdir)/regtest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/regtest/makefile.bcc b/samples/regtest/makefile.bcc index 1c3025b..af46f05 100644 --- a/samples/regtest/makefile.bcc +++ b/samples/regtest/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,18 +19,14 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -REGTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +REGTEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) REGTEST_OBJECTS = \ $(OBJS)\regtest_regtest.obj SETUPHDIR = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\regtest.ils del $(OBJS)\regtest.ils $(OBJS)\regtest.exe: $(REGTEST_OBJECTS) $(OBJS)\regtest_regtest.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(REGTEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\regtest_regtest.res | diff --git a/samples/regtest/makefile.gcc b/samples/regtest/makefile.gcc index d763ab2..c971e97 100644 --- a/samples/regtest/makefile.gcc +++ b/samples/regtest/makefile.gcc @@ -14,11 +14,11 @@ include ../../build/msw/config.gcc OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -REGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +REGTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) REGTEST_OBJECTS = \ $(OBJS)\regtest_regtest.o \ $(OBJS)\regtest_regtest_rc.o diff --git a/samples/regtest/makefile.vc b/samples/regtest/makefile.vc index c8475ca..019b03d 100644 --- a/samples/regtest/makefile.vc +++ b/samples/regtest/makefile.vc @@ -14,12 +14,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -REGTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\regtest.pdb $(____DEBUGRUNTIME_2_p) \ +REGTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\regtest.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) REGTEST_OBJECTS = \ $(OBJS)\regtest_regtest.obj \ $(OBJS)\regtest_regtest.res diff --git a/samples/regtest/makefile.wat b/samples/regtest/makefile.wat index 227e33d..065c20d 100644 --- a/samples/regtest/makefile.wat +++ b/samples/regtest/makefile.wat @@ -169,10 +169,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -REGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +REGTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) REGTEST_OBJECTS = & $(OBJS)\regtest_regtest.obj SETUPHDIR = & diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in index 247e288..ec41eaf 100644 --- a/samples/render/Makefile.in +++ b/samples/render/Makefile.in @@ -40,13 +40,12 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -RENDDLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -DWXUSINGDLL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) +RENDDLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -DWXUSINGDLL \ + $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) RENDDLL_OBJECTS = \ renddll_renddll.o -RENDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +RENDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) RENDER_OBJECTS = \ $(__render___win32rc) \ $(__render_os2_lib_res) \ @@ -88,8 +87,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o render$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o render$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -175,7 +174,7 @@ render_render.o: $(srcdir)/render.cpp $(CXXC) -c -o $@ $(RENDER_CXXFLAGS) $< render_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/render/makefile.bcc b/samples/render/makefile.bcc index a1b3c61..c972b2b 100644 --- a/samples/render/makefile.bcc +++ b/samples/render/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,24 +19,20 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -RENDDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_0) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -DWXUSINGDLL $(CXXFLAGS) +RENDDLL_CXXFLAGS = $(__RUNTIME_LIBS_0) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -DWXUSINGDLL \ + $(CPPFLAGS) $(CXXFLAGS) RENDDLL_OBJECTS = \ $(OBJS)\renddll_renddll.obj -RENDER_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_0) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) +RENDER_CXXFLAGS = $(__RUNTIME_LIBS_0) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \ + -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) RENDER_OBJECTS = \ $(OBJS)\render_render.obj SETUPHDIR = \ @@ -190,12 +191,12 @@ clean: !if "$(SHARED)" == "1" $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)251_bcc.dll: $(RENDDLL_OBJECTS) - ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| c0d32.obj $(RENDDLL_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS).lib,, | !endif $(OBJS)\render.exe: $(RENDER_OBJECTS) $(OBJS)\render_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(RENDER_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS).lib,, $(OBJS)\render_sample.res | diff --git a/samples/render/makefile.gcc b/samples/render/makefile.gcc index ceeb174..9d1c488 100644 --- a/samples/render/makefile.gcc +++ b/samples/render/makefile.gcc @@ -14,17 +14,16 @@ include ../../build/msw/config.gcc OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -RENDDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -DWXUSINGDLL \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG_0) $(__EXCEPTIONSFLAG) +RENDDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\include -I$(SETUPHDIR) -Wall -DWXUSINGDLL $(__EXCEPTIONSFLAG_0) \ + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) RENDDLL_OBJECTS = \ $(OBJS)\renddll_renddll.o -RENDER_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_0) \ - $(__EXCEPTIONSFLAG) +RENDER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ + $(__EXCEPTIONSFLAG_0) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) RENDER_OBJECTS = \ $(OBJS)\render_sample_rc.o \ $(OBJS)\render_render.o diff --git a/samples/render/makefile.vc b/samples/render/makefile.vc index 9ed796c..e41d565 100644 --- a/samples/render/makefile.vc +++ b/samples/render/makefile.vc @@ -14,21 +14,21 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -RENDDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_16) /DWIN32 \ +RENDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_16) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)251_vc.pdb \ $(____DEBUGRUNTIME_15_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - /I.\..\..\include /I$(SETUPHDIR) /W4 /DWXUSINGDLL $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_0) $(__EXCEPTIONSFLAG) + /I.\..\..\include /I$(SETUPHDIR) /W4 /DWXUSINGDLL $(__EXCEPTIONSFLAG_0) \ + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) RENDDLL_OBJECTS = \ $(OBJS)\renddll_renddll.obj -RENDER_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ +RENDER_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO) /Fd$(OBJS)\render.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_0) $(__EXCEPTIONSFLAG) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_0) \ + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) RENDER_OBJECTS = \ $(OBJS)\render_sample.res \ $(OBJS)\render_render.obj diff --git a/samples/render/makefile.wat b/samples/render/makefile.wat index 6d5b493..34ae359 100644 --- a/samples/render/makefile.wat +++ b/samples/render/makefile.wat @@ -174,16 +174,16 @@ __renddll___depname = & OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -RENDDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -dWXUSINGDLL & - $(CXXFLAGS) $(__EXCEPTIONSFLAG) +RENDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -dWXUSINGDLL $(__EXCEPTIONSFLAG) & + $(CPPFLAGS) $(CXXFLAGS) RENDDLL_OBJECTS = & $(OBJS)\renddll_renddll.obj -RENDER_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG) +RENDER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) RENDER_OBJECTS = & $(OBJS)\render_render.obj SETUPHDIR = & diff --git a/samples/richedit/Makefile.in b/samples/richedit/Makefile.in index 4dae584..5afb91a 100644 --- a/samples/richedit/Makefile.in +++ b/samples/richedit/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -RICHEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +RICHEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) RICHEDIT_OBJECTS = \ $(__richedit___win32rc) \ $(__richedit_os2_lib_res) \ @@ -81,8 +80,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o richedit$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o richedit$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -166,7 +165,7 @@ richedit_kbList.o: $(srcdir)/kbList.cpp $(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $< richedit_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples richedit_wxLayout.o: $(srcdir)/wxLayout.cpp $(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $< diff --git a/samples/richedit/makefile.bcc b/samples/richedit/makefile.bcc index dff087f..e19fb2f 100644 --- a/samples/richedit/makefile.bcc +++ b/samples/richedit/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,18 +19,14 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -RICHEDIT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +RICHEDIT_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) RICHEDIT_OBJECTS = \ $(OBJS)\richedit_wxLayout.obj \ $(OBJS)\richedit_kbList.obj \ @@ -190,6 +191,6 @@ data: for %f in (wxLayout.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\richedit.exe: $(RICHEDIT_OBJECTS) $(OBJS)\richedit_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(RICHEDIT_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\richedit_sample.res | diff --git a/samples/richedit/makefile.gcc b/samples/richedit/makefile.gcc index 90b4cad..89fc7de 100644 --- a/samples/richedit/makefile.gcc +++ b/samples/richedit/makefile.gcc @@ -14,11 +14,11 @@ include ../../build/msw/config.gcc OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -RICHEDIT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +RICHEDIT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) RICHEDIT_OBJECTS = \ $(OBJS)\richedit_sample_rc.o \ $(OBJS)\richedit_wxLayout.o \ diff --git a/samples/richedit/makefile.vc b/samples/richedit/makefile.vc index 29cfe3b..2122fdf 100644 --- a/samples/richedit/makefile.vc +++ b/samples/richedit/makefile.vc @@ -14,12 +14,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -RICHEDIT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\richedit.pdb $(____DEBUGRUNTIME_2_p) \ +RICHEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\richedit.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) RICHEDIT_OBJECTS = \ $(OBJS)\richedit_sample.res \ $(OBJS)\richedit_wxLayout.obj \ diff --git a/samples/richedit/makefile.wat b/samples/richedit/makefile.wat index 34ec872..7e7844e 100644 --- a/samples/richedit/makefile.wat +++ b/samples/richedit/makefile.wat @@ -169,10 +169,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -RICHEDIT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +RICHEDIT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) RICHEDIT_OBJECTS = & $(OBJS)\richedit_wxLayout.obj & $(OBJS)\richedit_kbList.obj & diff --git a/samples/rotate/Makefile.in b/samples/rotate/Makefile.in index b8a582c..8fb8e34 100644 --- a/samples/rotate/Makefile.in +++ b/samples/rotate/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -ROTATE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +ROTATE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) ROTATE_OBJECTS = \ $(__rotate_os2_lib_res) \ rotate_rotate.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o rotate$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o rotate$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -162,7 +161,7 @@ rotate_rotate.o: $(srcdir)/rotate.cpp $(CXXC) -c -o $@ $(ROTATE_CXXFLAGS) $< rotate_rotate_rc.o: $(srcdir)/rotate.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/rotate/makefile.bcc b/samples/rotate/makefile.bcc index 933ce7f..fb3b425 100644 --- a/samples/rotate/makefile.bcc +++ b/samples/rotate/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,18 +19,14 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -ROTATE_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +ROTATE_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) ROTATE_OBJECTS = \ $(OBJS)\rotate_rotate.obj SETUPHDIR = \ @@ -174,6 +175,6 @@ data: for %f in (kclub.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\rotate.exe: $(ROTATE_OBJECTS) $(OBJS)\rotate_rotate.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(ROTATE_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\rotate_rotate.res | diff --git a/samples/rotate/makefile.gcc b/samples/rotate/makefile.gcc index cf21a42..05ad3e4 100644 --- a/samples/rotate/makefile.gcc +++ b/samples/rotate/makefile.gcc @@ -14,11 +14,11 @@ include ../../build/msw/config.gcc OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -ROTATE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +ROTATE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) ROTATE_OBJECTS = \ $(OBJS)\rotate_rotate.o \ $(OBJS)\rotate_rotate_rc.o diff --git a/samples/rotate/makefile.vc b/samples/rotate/makefile.vc index bdf1804..1d236a4 100644 --- a/samples/rotate/makefile.vc +++ b/samples/rotate/makefile.vc @@ -14,12 +14,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -ROTATE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +ROTATE_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\rotate.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) ROTATE_OBJECTS = \ $(OBJS)\rotate_rotate.obj \ $(OBJS)\rotate_rotate.res diff --git a/samples/rotate/makefile.wat b/samples/rotate/makefile.wat index 6a4f636..9bc8d0c 100644 --- a/samples/rotate/makefile.wat +++ b/samples/rotate/makefile.wat @@ -169,10 +169,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -ROTATE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +ROTATE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) ROTATE_OBJECTS = & $(OBJS)\rotate_rotate.obj SETUPHDIR = & diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in index ca1aa99..0e2ccd5 100644 --- a/samples/sashtest/Makefile.in +++ b/samples/sashtest/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -SASHTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +SASHTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) SASHTEST_OBJECTS = \ $(__sashtest_os2_lib_res) \ sashtest_sashtest.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o sashtest$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o sashtest$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ @@ -157,7 +156,7 @@ sashtest_sashtest.o: $(srcdir)/sashtest.cpp $(CXXC) -c -o $@ $(SASHTEST_CXXFLAGS) $< sashtest_sashtest_rc.o: $(srcdir)/sashtest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/sashtest/makefile.bcc b/samples/sashtest/makefile.bcc index 48acf86..dcc4d6f 100644 --- a/samples/sashtest/makefile.bcc +++ b/samples/sashtest/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,18 +19,14 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SASHTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +SASHTEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) SASHTEST_OBJECTS = \ $(OBJS)\sashtest_sashtest.obj SETUPHDIR = \ @@ -174,6 +175,6 @@ clean: -if exist $(OBJS)\sashtest.ils del $(OBJS)\sashtest.ils $(OBJS)\sashtest.exe: $(SASHTEST_OBJECTS) $(OBJS)\sashtest_sashtest.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(SASHTEST_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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\sashtest_sashtest.res | diff --git a/samples/sashtest/makefile.gcc b/samples/sashtest/makefile.gcc index 64d245e..adf9dd0 100644 --- a/samples/sashtest/makefile.gcc +++ b/samples/sashtest/makefile.gcc @@ -14,11 +14,11 @@ include ../../build/msw/config.gcc OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SASHTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +SASHTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) SASHTEST_OBJECTS = \ $(OBJS)\sashtest_sashtest.o \ $(OBJS)\sashtest_sashtest_rc.o diff --git a/samples/sashtest/makefile.vc b/samples/sashtest/makefile.vc index 1234cfa..2c6f849 100644 --- a/samples/sashtest/makefile.vc +++ b/samples/sashtest/makefile.vc @@ -14,12 +14,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SASHTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\sashtest.pdb $(____DEBUGRUNTIME_2_p) \ +SASHTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\sashtest.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) SASHTEST_OBJECTS = \ $(OBJS)\sashtest_sashtest.obj \ $(OBJS)\sashtest_sashtest.res diff --git a/samples/sashtest/makefile.wat b/samples/sashtest/makefile.wat index bdd026e..187e77a 100644 --- a/samples/sashtest/makefile.wat +++ b/samples/sashtest/makefile.wat @@ -174,10 +174,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SASHTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +SASHTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) SASHTEST_OBJECTS = & $(OBJS)\sashtest_sashtest.obj SETUPHDIR = & diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in index ca79d18..239f095 100644 --- a/samples/scroll/Makefile.in +++ b/samples/scroll/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -SCROLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +SCROLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) SCROLL_OBJECTS = \ $(__scroll_os2_lib_res) \ scroll_scroll.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o scroll$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o scroll$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ scroll_scroll.o: $(srcdir)/scroll.cpp $(CXXC) -c -o $@ $(SCROLL_CXXFLAGS) $< scroll_scroll_rc.o: $(srcdir)/scroll.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/scroll/makefile.bcc b/samples/scroll/makefile.bcc index 681ddb5..59935db 100644 --- a/samples/scroll/makefile.bcc +++ b/samples/scroll/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,18 +19,14 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SCROLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +SCROLL_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) SCROLL_OBJECTS = \ $(OBJS)\scroll_scroll.obj SETUPHDIR = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\scroll.ils del $(OBJS)\scroll.ils $(OBJS)\scroll.exe: $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(SCROLL_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\scroll_scroll.res | diff --git a/samples/scroll/makefile.gcc b/samples/scroll/makefile.gcc index c2aeec0..095278f 100644 --- a/samples/scroll/makefile.gcc +++ b/samples/scroll/makefile.gcc @@ -14,11 +14,11 @@ include ../../build/msw/config.gcc OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SCROLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +SCROLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) SCROLL_OBJECTS = \ $(OBJS)\scroll_scroll.o \ $(OBJS)\scroll_scroll_rc.o diff --git a/samples/scroll/makefile.vc b/samples/scroll/makefile.vc index 1ebb3a1..4160a9b 100644 --- a/samples/scroll/makefile.vc +++ b/samples/scroll/makefile.vc @@ -14,12 +14,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SCROLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +SCROLL_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\scroll.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) SCROLL_OBJECTS = \ $(OBJS)\scroll_scroll.obj \ $(OBJS)\scroll_scroll.res diff --git a/samples/scroll/makefile.wat b/samples/scroll/makefile.wat index 12ae9a1..5e36185 100644 --- a/samples/scroll/makefile.wat +++ b/samples/scroll/makefile.wat @@ -169,10 +169,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SCROLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +SCROLL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) SCROLL_OBJECTS = & $(OBJS)\scroll_scroll.obj SETUPHDIR = & diff --git a/samples/scrollsub/Makefile.in b/samples/scrollsub/Makefile.in index efb37a3..2d63876 100644 --- a/samples/scrollsub/Makefile.in +++ b/samples/scrollsub/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -SCROLLSUB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +SCROLLSUB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) SCROLLSUB_OBJECTS = \ $(__scrollsub_os2_lib_res) \ scrollsub_scrollsub.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o scrollsub$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o scrollsub$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ scrollsub_scrollsub.o: $(srcdir)/scrollsub.cpp $(CXXC) -c -o $@ $(SCROLLSUB_CXXFLAGS) $< scrollsub_scrollsub_rc.o: $(srcdir)/scrollsub.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/scrollsub/makefile.bcc b/samples/scrollsub/makefile.bcc index 57209a1..3220416 100644 --- a/samples/scrollsub/makefile.bcc +++ b/samples/scrollsub/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,18 +19,14 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SCROLLSUB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +SCROLLSUB_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) SCROLLSUB_OBJECTS = \ $(OBJS)\scrollsub_scrollsub.obj SETUPHDIR = \ @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\scrollsub.ils del $(OBJS)\scrollsub.ils $(OBJS)\scrollsub.exe: $(SCROLLSUB_OBJECTS) $(OBJS)\scrollsub_scrollsub.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(SCROLLSUB_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\scrollsub_scrollsub.res | diff --git a/samples/scrollsub/makefile.gcc b/samples/scrollsub/makefile.gcc index f89d61f..9752da5 100644 --- a/samples/scrollsub/makefile.gcc +++ b/samples/scrollsub/makefile.gcc @@ -14,11 +14,11 @@ include ../../build/msw/config.gcc OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SCROLLSUB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +SCROLLSUB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) SCROLLSUB_OBJECTS = \ $(OBJS)\scrollsub_scrollsub.o \ $(OBJS)\scrollsub_scrollsub_rc.o diff --git a/samples/scrollsub/makefile.vc b/samples/scrollsub/makefile.vc index f7a3136..71f7ec0 100644 --- a/samples/scrollsub/makefile.vc +++ b/samples/scrollsub/makefile.vc @@ -14,12 +14,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SCROLLSUB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\scrollsub.pdb $(____DEBUGRUNTIME_2_p) \ +SCROLLSUB_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\scrollsub.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) SCROLLSUB_OBJECTS = \ $(OBJS)\scrollsub_scrollsub.obj \ $(OBJS)\scrollsub_scrollsub.res diff --git a/samples/scrollsub/makefile.wat b/samples/scrollsub/makefile.wat index 0a8da8f..aa7c80b 100644 --- a/samples/scrollsub/makefile.wat +++ b/samples/scrollsub/makefile.wat @@ -169,10 +169,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SCROLLSUB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +SCROLLSUB_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) SCROLLSUB_OBJECTS = & $(OBJS)\scrollsub_scrollsub.obj SETUPHDIR = & diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in index ce918b4..e1a01e6 100644 --- a/samples/shaped/Makefile.in +++ b/samples/shaped/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -SHAPED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +SHAPED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) SHAPED_OBJECTS = \ $(__shaped_os2_lib_res) \ shaped_shaped.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o shaped$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o shaped$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -162,7 +161,7 @@ shaped_shaped.o: $(srcdir)/shaped.cpp $(CXXC) -c -o $@ $(SHAPED_CXXFLAGS) $< shaped_shaped_rc.o: $(srcdir)/shaped.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/shaped/makefile.bcc b/samples/shaped/makefile.bcc index 88d71f9..7e2b437 100644 --- a/samples/shaped/makefile.bcc +++ b/samples/shaped/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,16 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SHAPED_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +SHAPED_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) SHAPED_OBJECTS = \ $(OBJS)\shaped_shaped.obj @@ -174,6 +175,6 @@ data: for %f in (star.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(SHAPED_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\shaped_shaped.res | diff --git a/samples/shaped/makefile.gcc b/samples/shaped/makefile.gcc index fd3e1be..fd46e9e 100644 --- a/samples/shaped/makefile.gcc +++ b/samples/shaped/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SHAPED_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +SHAPED_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) SHAPED_OBJECTS = \ $(OBJS)\shaped_shaped.o \ $(OBJS)\shaped_shaped_rc.o diff --git a/samples/shaped/makefile.vc b/samples/shaped/makefile.vc index 2253c17..f46173b 100644 --- a/samples/shaped/makefile.vc +++ b/samples/shaped/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SHAPED_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +SHAPED_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\shaped.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) SHAPED_OBJECTS = \ $(OBJS)\shaped_shaped.obj \ $(OBJS)\shaped_shaped.res diff --git a/samples/shaped/makefile.wat b/samples/shaped/makefile.wat index a95a988..84c9d5f 100644 --- a/samples/shaped/makefile.wat +++ b/samples/shaped/makefile.wat @@ -171,10 +171,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SHAPED_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +SHAPED_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) SHAPED_OBJECTS = & $(OBJS)\shaped_shaped.obj diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in index 4a4cadc..87b0b07 100644 --- a/samples/sockets/Makefile.in +++ b/samples/sockets/Makefile.in @@ -34,18 +34,16 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) CLIENT_OBJECTS = \ $(os2_lib_res) \ client_client.o \ $(__client___win32rc) DESTDIR = LIBDIRNAME = $(top_builddir)lib -SERVER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +SERVER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) SERVER_OBJECTS = \ $(os2_lib_res) \ server_server.o \ @@ -84,13 +82,13 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o client$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_6) -i \ + $(srcdir)/../../samples -o client$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_2 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o server$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_6) -i \ + $(srcdir)/../../samples -o server$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_3 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -170,7 +168,7 @@ client_client.o: $(srcdir)/client.cpp $(CXXC) -c -o $@ $(CLIENT_CXXFLAGS) $< client_client_rc.o: $(srcdir)/client.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile @@ -213,7 +211,7 @@ server_server.o: $(srcdir)/server.cpp $(CXXC) -c -o $@ $(SERVER_CXXFLAGS) $< server_server_rc.o: $(srcdir)/server.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/sockets/makefile.bcc b/samples/sockets/makefile.bcc index 701472a..a9ca7bd 100644 --- a/samples/sockets/makefile.bcc +++ b/samples/sockets/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,24 +19,20 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -CLIENT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_0) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) +CLIENT_CXXFLAGS = $(__RUNTIME_LIBS_0) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \ + -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) CLIENT_OBJECTS = \ $(OBJS)\client_client.obj OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SERVER_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_0) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) +SERVER_CXXFLAGS = $(__RUNTIME_LIBS_0) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \ + -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) SERVER_OBJECTS = \ $(OBJS)\server_server.obj SETUPHDIR = \ @@ -191,11 +192,11 @@ clean: -if exist $(OBJS)\server.ils del $(OBJS)\server.ils $(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(CLIENT_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS).lib,, $(OBJS)\client_client.res | $(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_server.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(SERVER_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS).lib,, $(OBJS)\server_server.res | diff --git a/samples/sockets/makefile.gcc b/samples/sockets/makefile.gcc index 90cacf6..02b00fe 100644 --- a/samples/sockets/makefile.gcc +++ b/samples/sockets/makefile.gcc @@ -12,21 +12,19 @@ include ../../build/msw/config.gcc ### Variables: ### -CLIENT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_0) \ - $(__EXCEPTIONSFLAG) +CLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ + $(__EXCEPTIONSFLAG_0) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) CLIENT_OBJECTS = \ $(OBJS)\client_client.o \ $(OBJS)\client_client_rc.o OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SERVER_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_0) \ - $(__EXCEPTIONSFLAG) +SERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ + $(__EXCEPTIONSFLAG_0) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) SERVER_OBJECTS = \ $(OBJS)\server_server.o \ $(OBJS)\server_server_rc.o diff --git a/samples/sockets/makefile.vc b/samples/sockets/makefile.vc index 789a020..ae48b3c 100644 --- a/samples/sockets/makefile.vc +++ b/samples/sockets/makefile.vc @@ -12,23 +12,23 @@ ### Variables: ### -CLIENT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ +CLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO) /Fd$(OBJS)\client.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_0) $(__EXCEPTIONSFLAG) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_0) \ + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) CLIENT_OBJECTS = \ $(OBJS)\client_client.obj \ $(OBJS)\client_client.res OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SERVER_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_16) /DWIN32 \ +SERVER_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_16) /DWIN32 \ $(__DEBUGINFO) /Fd$(OBJS)\server.pdb $(____DEBUGRUNTIME_15_p) \ $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_0) $(__EXCEPTIONSFLAG) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_0) \ + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) SERVER_OBJECTS = \ $(OBJS)\server_server.obj \ $(OBJS)\server_server.res diff --git a/samples/sockets/makefile.wat b/samples/sockets/makefile.wat index 0037586..30d2060 100644 --- a/samples/sockets/makefile.wat +++ b/samples/sockets/makefile.wat @@ -171,18 +171,18 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -CLIENT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG) +CLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) CLIENT_OBJECTS = & $(OBJS)\client_client.obj OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SERVER_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG) +SERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) SERVER_OBJECTS = & $(OBJS)\server_server.obj SETUPHDIR = & diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in index feacfd9..5d2f714 100644 --- a/samples/splitter/Makefile.in +++ b/samples/splitter/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -SPLITTER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +SPLITTER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) SPLITTER_OBJECTS = \ $(__splitter_os2_lib_res) \ splitter_splitter.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o splitter$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o splitter$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ splitter_splitter.o: $(srcdir)/splitter.cpp $(CXXC) -c -o $@ $(SPLITTER_CXXFLAGS) $< splitter_splitter_rc.o: $(srcdir)/splitter.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/splitter/makefile.bcc b/samples/splitter/makefile.bcc index 6d105ba..2fc97e0 100644 --- a/samples/splitter/makefile.bcc +++ b/samples/splitter/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,16 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SPLITTER_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +SPLITTER_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) SPLITTER_OBJECTS = \ $(OBJS)\splitter_splitter.obj @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\splitter.ils del $(OBJS)\splitter.ils $(OBJS)\splitter.exe: $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(SPLITTER_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\splitter_splitter.res | diff --git a/samples/splitter/makefile.gcc b/samples/splitter/makefile.gcc index e9b0a04..ebe0dba 100644 --- a/samples/splitter/makefile.gcc +++ b/samples/splitter/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SPLITTER_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +SPLITTER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) SPLITTER_OBJECTS = \ $(OBJS)\splitter_splitter.o \ $(OBJS)\splitter_splitter_rc.o diff --git a/samples/splitter/makefile.vc b/samples/splitter/makefile.vc index 1443fef..ebc83bf 100644 --- a/samples/splitter/makefile.vc +++ b/samples/splitter/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SPLITTER_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\splitter.pdb $(____DEBUGRUNTIME_2_p) \ +SPLITTER_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\splitter.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) SPLITTER_OBJECTS = \ $(OBJS)\splitter_splitter.obj \ $(OBJS)\splitter_splitter.res diff --git a/samples/splitter/makefile.wat b/samples/splitter/makefile.wat index f1e5b60..0aa9421 100644 --- a/samples/splitter/makefile.wat +++ b/samples/splitter/makefile.wat @@ -171,10 +171,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SPLITTER_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +SPLITTER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) SPLITTER_OBJECTS = & $(OBJS)\splitter_splitter.obj diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in index 4cdb59e..58e700a 100644 --- a/samples/statbar/Makefile.in +++ b/samples/statbar/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -STATBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +STATBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) STATBAR_OBJECTS = \ $(__statbar_os2_lib_res) \ statbar_statbar.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o statbar$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o statbar$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ statbar_statbar.o: $(srcdir)/statbar.cpp $(CXXC) -c -o $@ $(STATBAR_CXXFLAGS) $< statbar_statbar_rc.o: $(srcdir)/statbar.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/statbar/makefile.bcc b/samples/statbar/makefile.bcc index 5dc631c..015d036 100644 --- a/samples/statbar/makefile.bcc +++ b/samples/statbar/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,16 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STATBAR_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +STATBAR_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) STATBAR_OBJECTS = \ $(OBJS)\statbar_statbar.obj @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\statbar.ils del $(OBJS)\statbar.ils $(OBJS)\statbar.exe: $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(STATBAR_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\statbar_statbar.res | diff --git a/samples/statbar/makefile.gcc b/samples/statbar/makefile.gcc index 32b12dc..f02077f 100644 --- a/samples/statbar/makefile.gcc +++ b/samples/statbar/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STATBAR_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +STATBAR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) STATBAR_OBJECTS = \ $(OBJS)\statbar_statbar.o \ $(OBJS)\statbar_statbar_rc.o diff --git a/samples/statbar/makefile.vc b/samples/statbar/makefile.vc index c939983..f8bd834 100644 --- a/samples/statbar/makefile.vc +++ b/samples/statbar/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STATBAR_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\statbar.pdb $(____DEBUGRUNTIME_2_p) \ +STATBAR_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\statbar.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) STATBAR_OBJECTS = \ $(OBJS)\statbar_statbar.obj \ $(OBJS)\statbar_statbar.res diff --git a/samples/statbar/makefile.wat b/samples/statbar/makefile.wat index ca6be41..7fb79d7 100644 --- a/samples/statbar/makefile.wat +++ b/samples/statbar/makefile.wat @@ -171,10 +171,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STATBAR_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +STATBAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) STATBAR_OBJECTS = & $(OBJS)\statbar_statbar.obj diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in index ecd5b2e..202d744 100644 --- a/samples/stc/Makefile.in +++ b/samples/stc/Makefile.in @@ -36,10 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -STCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \ - $(CXXFLAGS) +STCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ + $(CPPFLAGS) $(CXXFLAGS) STCTEST_OBJECTS = \ $(__stctest___win32rc) \ $(__stctest_os2_lib_res) \ @@ -80,10 +79,9 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \ - stctest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \ - sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -i $(srcdir)/../../include -o stctest$(EXEEXT) \ + Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -169,7 +167,7 @@ stctest_prefs.o: $(srcdir)/prefs.cpp $(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $< stctest_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples stctest_stctest.o: $(srcdir)/stctest.cpp $(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $< diff --git a/samples/stc/makefile.bcc b/samples/stc/makefile.bcc index fedb0ad..37f1c33 100644 --- a/samples/stc/makefile.bcc +++ b/samples/stc/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,21 +19,17 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STCTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +STCTEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \ - $(CXXFLAGS) + $(CPPFLAGS) $(CXXFLAGS) STCTEST_OBJECTS = \ $(OBJS)\stctest_stctest.obj \ $(OBJS)\stctest_edit.obj \ @@ -183,6 +184,6 @@ data: for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\stctest.exe: $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(STCTEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\stctest_sample.res | diff --git a/samples/stc/makefile.gcc b/samples/stc/makefile.gcc index a34e4ad..2fb9452 100644 --- a/samples/stc/makefile.gcc +++ b/samples/stc/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STCTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +STCTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) STCTEST_OBJECTS = \ $(OBJS)\stctest_sample_rc.o \ $(OBJS)\stctest_stctest.o \ diff --git a/samples/stc/makefile.vc b/samples/stc/makefile.vc index 85d11d6..c03ca09 100644 --- a/samples/stc/makefile.vc +++ b/samples/stc/makefile.vc @@ -16,12 +16,13 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STCTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\stctest.pdb $(____DEBUGRUNTIME_2_p) \ +STCTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\stctest.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - /I.\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /I.\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) \ + $(CXXFLAGS) STCTEST_OBJECTS = \ $(OBJS)\stctest_sample.res \ $(OBJS)\stctest_stctest.obj \ diff --git a/samples/stc/makefile.wat b/samples/stc/makefile.wat index faa5b33..db148c9 100644 --- a/samples/stc/makefile.wat +++ b/samples/stc/makefile.wat @@ -171,11 +171,11 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STCTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include $(CXXFLAGS) & - $(__EXCEPTIONSFLAG_7) +STCTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -i=.\..\..\include $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) & + $(CXXFLAGS) STCTEST_OBJECTS = & $(OBJS)\stctest_stctest.obj & $(OBJS)\stctest_edit.obj & diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in index 1cac1fd..b69d541 100644 --- a/samples/svg/Makefile.in +++ b/samples/svg/Makefile.in @@ -36,10 +36,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -SVGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \ - $(CXXFLAGS) +SVGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ + $(CPPFLAGS) $(CXXFLAGS) SVGTEST_OBJECTS = \ $(__svgtest___win32rc) \ $(__svgtest_os2_lib_res) \ @@ -78,10 +77,9 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \ - svgtest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \ - sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -i $(srcdir)/../../include -o svgtest$(EXEEXT) \ + Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -153,7 +151,7 @@ svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. @COND_PLATFORM_MACOSX_1@svgtest_bundle: svgtest.app/Contents/PkgInfo svgtest_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples svgtest_svgtest.o: $(srcdir)/svgtest.cpp $(CXXC) -c -o $@ $(SVGTEST_CXXFLAGS) $< diff --git a/samples/svg/makefile.bcc b/samples/svg/makefile.bcc index e6be13a..c9cc4ff 100644 --- a/samples/svg/makefile.bcc +++ b/samples/svg/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,21 +19,17 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +SVGTEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \ - $(CXXFLAGS) + $(CPPFLAGS) $(CXXFLAGS) SVGTEST_OBJECTS = \ $(OBJS)\svgtest_svgtest.obj @@ -171,6 +172,6 @@ clean: -if exist $(OBJS)\svgtest.ils del $(OBJS)\svgtest.ils $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(SVGTEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\svgtest_sample.res | diff --git a/samples/svg/makefile.gcc b/samples/svg/makefile.gcc index 82721b2..5b90400 100644 --- a/samples/svg/makefile.gcc +++ b/samples/svg/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +SVGTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) SVGTEST_OBJECTS = \ $(OBJS)\svgtest_sample_rc.o \ $(OBJS)\svgtest_svgtest.o diff --git a/samples/svg/makefile.vc b/samples/svg/makefile.vc index a5ebdab..ed8b838 100644 --- a/samples/svg/makefile.vc +++ b/samples/svg/makefile.vc @@ -16,12 +16,13 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SVGTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\svgtest.pdb $(____DEBUGRUNTIME_2_p) \ +SVGTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\svgtest.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - /I.\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /I.\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) \ + $(CXXFLAGS) SVGTEST_OBJECTS = \ $(OBJS)\svgtest_sample.res \ $(OBJS)\svgtest_svgtest.obj diff --git a/samples/svg/makefile.wat b/samples/svg/makefile.wat index 7a7526b..895ce25 100644 --- a/samples/svg/makefile.wat +++ b/samples/svg/makefile.wat @@ -171,11 +171,11 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include $(CXXFLAGS) & - $(__EXCEPTIONSFLAG_7) +SVGTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -i=.\..\..\include $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) & + $(CXXFLAGS) SVGTEST_OBJECTS = & $(OBJS)\svgtest_svgtest.obj diff --git a/samples/tab/Makefile.in b/samples/tab/Makefile.in index 90b0239..c567023 100644 --- a/samples/tab/Makefile.in +++ b/samples/tab/Makefile.in @@ -36,8 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -TAB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \ - -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +TAB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) TAB_OBJECTS = \ $(__tab_os2_lib_res) \ tab_tab.o \ @@ -76,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o tab$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o tab$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -152,7 +152,7 @@ tab_tab.o: $(srcdir)/tab.cpp $(CXXC) -c -o $@ $(TAB_CXXFLAGS) $< tab_tab_rc.o: $(srcdir)/tab.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/tab/makefile.bcc b/samples/tab/makefile.bcc index c090817..e1cc297 100644 --- a/samples/tab/makefile.bcc +++ b/samples/tab/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,16 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TAB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +TAB_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) TAB_OBJECTS = \ $(OBJS)\tab_tab.obj @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\tab.ils del $(OBJS)\tab.ils $(OBJS)\tab.exe: $(TAB_OBJECTS) $(OBJS)\tab_tab.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(TAB_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\tab_tab.res | diff --git a/samples/tab/makefile.gcc b/samples/tab/makefile.gcc index f145887..2dbe43a 100644 --- a/samples/tab/makefile.gcc +++ b/samples/tab/makefile.gcc @@ -16,11 +16,10 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TAB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +TAB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) TAB_OBJECTS = \ $(OBJS)\tab_tab.o \ $(OBJS)\tab_tab_rc.o diff --git a/samples/tab/makefile.vc b/samples/tab/makefile.vc index d61577f..cd1eb2d 100644 --- a/samples/tab/makefile.vc +++ b/samples/tab/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TAB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +TAB_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\tab.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) TAB_OBJECTS = \ $(OBJS)\tab_tab.obj \ $(OBJS)\tab_tab.res diff --git a/samples/tab/makefile.wat b/samples/tab/makefile.wat index 9a7dbaf..fdc6e13 100644 --- a/samples/tab/makefile.wat +++ b/samples/tab/makefile.wat @@ -171,10 +171,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TAB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +TAB_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) TAB_OBJECTS = & $(OBJS)\tab_tab.obj diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in index 84d44ab..6a7b087 100644 --- a/samples/taskbar/Makefile.in +++ b/samples/taskbar/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -TASKBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +TASKBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) TASKBAR_OBJECTS = \ $(__taskbar_os2_lib_res) \ taskbar_tbtest.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o taskbar$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o taskbar$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ @@ -157,7 +156,7 @@ taskbar_tbtest.o: $(srcdir)/tbtest.cpp $(CXXC) -c -o $@ $(TASKBAR_CXXFLAGS) $< taskbar_tbtest_rc.o: $(srcdir)/tbtest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/taskbar/makefile.bcc b/samples/taskbar/makefile.bcc index 1f9174f..bc8bc56 100644 --- a/samples/taskbar/makefile.bcc +++ b/samples/taskbar/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,16 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TASKBAR_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +TASKBAR_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) TASKBAR_OBJECTS = \ $(OBJS)\taskbar_tbtest.obj @@ -174,6 +175,6 @@ clean: -if exist $(OBJS)\taskbar.ils del $(OBJS)\taskbar.ils $(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_tbtest.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(TASKBAR_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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\taskbar_tbtest.res | diff --git a/samples/taskbar/makefile.gcc b/samples/taskbar/makefile.gcc index 93121d9..1e50bbd 100644 --- a/samples/taskbar/makefile.gcc +++ b/samples/taskbar/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TASKBAR_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +TASKBAR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) TASKBAR_OBJECTS = \ $(OBJS)\taskbar_tbtest.o \ $(OBJS)\taskbar_tbtest_rc.o diff --git a/samples/taskbar/makefile.vc b/samples/taskbar/makefile.vc index bfa2e1e..6107a5a 100644 --- a/samples/taskbar/makefile.vc +++ b/samples/taskbar/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TASKBAR_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\taskbar.pdb $(____DEBUGRUNTIME_2_p) \ +TASKBAR_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\taskbar.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) TASKBAR_OBJECTS = \ $(OBJS)\taskbar_tbtest.obj \ $(OBJS)\taskbar_tbtest.res diff --git a/samples/taskbar/makefile.wat b/samples/taskbar/makefile.wat index 09053ff..beec621 100644 --- a/samples/taskbar/makefile.wat +++ b/samples/taskbar/makefile.wat @@ -176,10 +176,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TASKBAR_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +TASKBAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) TASKBAR_OBJECTS = & $(OBJS)\taskbar_tbtest.obj diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in index ee3d60d..947cec3 100644 --- a/samples/text/Makefile.in +++ b/samples/text/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -TEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +TEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) TEXT_OBJECTS = \ $(__text_os2_lib_res) \ text_text.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o text$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o text$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ text_text.o: $(srcdir)/text.cpp $(CXXC) -c -o $@ $(TEXT_CXXFLAGS) $< text_text_rc.o: $(srcdir)/text.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/text/makefile.bcc b/samples/text/makefile.bcc index df9115a..ef6eb3b 100644 --- a/samples/text/makefile.bcc +++ b/samples/text/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,16 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEXT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +TEXT_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) TEXT_OBJECTS = \ $(OBJS)\text_text.obj @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\text.ils del $(OBJS)\text.ils $(OBJS)\text.exe: $(TEXT_OBJECTS) $(OBJS)\text_text.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(TEXT_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\text_text.res | diff --git a/samples/text/makefile.gcc b/samples/text/makefile.gcc index 501df5e..a069514 100644 --- a/samples/text/makefile.gcc +++ b/samples/text/makefile.gcc @@ -16,11 +16,10 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEXT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +TEXT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) TEXT_OBJECTS = \ $(OBJS)\text_text.o \ $(OBJS)\text_text_rc.o diff --git a/samples/text/makefile.vc b/samples/text/makefile.vc index 16520b6..65714df 100644 --- a/samples/text/makefile.vc +++ b/samples/text/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEXT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +TEXT_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\text.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) TEXT_OBJECTS = \ $(OBJS)\text_text.obj \ $(OBJS)\text_text.res diff --git a/samples/text/makefile.wat b/samples/text/makefile.wat index 441544f..79a6978 100644 --- a/samples/text/makefile.wat +++ b/samples/text/makefile.wat @@ -171,10 +171,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEXT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +TEXT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) TEXT_OBJECTS = & $(OBJS)\text_text.obj diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in index dd5133a..ddde4bb 100644 --- a/samples/thread/Makefile.in +++ b/samples/thread/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -THREAD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +THREAD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) THREAD_OBJECTS = \ $(__thread_os2_lib_res) \ thread_thread.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o thread$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o thread$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ thread_thread.o: $(srcdir)/thread.cpp $(CXXC) -c -o $@ $(THREAD_CXXFLAGS) $< thread_thread_rc.o: $(srcdir)/thread.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/thread/makefile.bcc b/samples/thread/makefile.bcc index 09889c5..25ce962 100644 --- a/samples/thread/makefile.bcc +++ b/samples/thread/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,16 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -THREAD_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +THREAD_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) THREAD_OBJECTS = \ $(OBJS)\thread_thread.obj @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\thread.ils del $(OBJS)\thread.ils $(OBJS)\thread.exe: $(THREAD_OBJECTS) $(OBJS)\thread_thread.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(THREAD_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\thread_thread.res | diff --git a/samples/thread/makefile.gcc b/samples/thread/makefile.gcc index b9b09c1..b85c1ec 100644 --- a/samples/thread/makefile.gcc +++ b/samples/thread/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -THREAD_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +THREAD_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) THREAD_OBJECTS = \ $(OBJS)\thread_thread.o \ $(OBJS)\thread_thread_rc.o diff --git a/samples/thread/makefile.vc b/samples/thread/makefile.vc index 3a594a8..a54779b 100644 --- a/samples/thread/makefile.vc +++ b/samples/thread/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -THREAD_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +THREAD_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\thread.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) THREAD_OBJECTS = \ $(OBJS)\thread_thread.obj \ $(OBJS)\thread_thread.res diff --git a/samples/thread/makefile.wat b/samples/thread/makefile.wat index 7af15ea..270e448 100644 --- a/samples/thread/makefile.wat +++ b/samples/thread/makefile.wat @@ -171,10 +171,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -THREAD_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +THREAD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) THREAD_OBJECTS = & $(OBJS)\thread_thread.obj diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in index 2480761..6e8714b 100644 --- a/samples/toolbar/Makefile.in +++ b/samples/toolbar/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -TOOLBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +TOOLBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) TOOLBAR_OBJECTS = \ $(__toolbar_os2_lib_res) \ toolbar_toolbar.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o toolbar$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o toolbar$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ toolbar_toolbar.o: $(srcdir)/toolbar.cpp $(CXXC) -c -o $@ $(TOOLBAR_CXXFLAGS) $< toolbar_toolbar_rc.o: $(srcdir)/toolbar.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/toolbar/makefile.bcc b/samples/toolbar/makefile.bcc index 6df12f2..fa3a823 100644 --- a/samples/toolbar/makefile.bcc +++ b/samples/toolbar/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,16 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TOOLBAR_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +TOOLBAR_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) TOOLBAR_OBJECTS = \ $(OBJS)\toolbar_toolbar.obj @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\toolbar.ils del $(OBJS)\toolbar.ils $(OBJS)\toolbar.exe: $(TOOLBAR_OBJECTS) $(OBJS)\toolbar_toolbar.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(TOOLBAR_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\toolbar_toolbar.res | diff --git a/samples/toolbar/makefile.gcc b/samples/toolbar/makefile.gcc index 4935265..86c4728 100644 --- a/samples/toolbar/makefile.gcc +++ b/samples/toolbar/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TOOLBAR_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +TOOLBAR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) TOOLBAR_OBJECTS = \ $(OBJS)\toolbar_toolbar.o \ $(OBJS)\toolbar_toolbar_rc.o diff --git a/samples/toolbar/makefile.vc b/samples/toolbar/makefile.vc index 7fc1d4b..9c71e80 100644 --- a/samples/toolbar/makefile.vc +++ b/samples/toolbar/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TOOLBAR_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\toolbar.pdb $(____DEBUGRUNTIME_2_p) \ +TOOLBAR_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\toolbar.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) TOOLBAR_OBJECTS = \ $(OBJS)\toolbar_toolbar.obj \ $(OBJS)\toolbar_toolbar.res diff --git a/samples/toolbar/makefile.wat b/samples/toolbar/makefile.wat index 5292d7a..96d3652 100644 --- a/samples/toolbar/makefile.wat +++ b/samples/toolbar/makefile.wat @@ -171,10 +171,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TOOLBAR_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +TOOLBAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) TOOLBAR_OBJECTS = & $(OBJS)\toolbar_toolbar.obj diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in index cd72bb9..850dec5 100644 --- a/samples/treectrl/Makefile.in +++ b/samples/treectrl/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -TREECTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +TREECTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) TREECTRL_OBJECTS = \ $(__treectrl_os2_lib_res) \ treectrl_treetest.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o treectrl$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o treectrl$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ treectrl_treetest.o: $(srcdir)/treetest.cpp $(CXXC) -c -o $@ $(TREECTRL_CXXFLAGS) $< treectrl_treetest_rc.o: $(srcdir)/treetest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/treectrl/makefile.bcc b/samples/treectrl/makefile.bcc index 9342fe1..c7c036d 100644 --- a/samples/treectrl/makefile.bcc +++ b/samples/treectrl/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,16 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TREECTRL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +TREECTRL_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) TREECTRL_OBJECTS = \ $(OBJS)\treectrl_treetest.obj @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\treectrl.ils del $(OBJS)\treectrl.ils $(OBJS)\treectrl.exe: $(TREECTRL_OBJECTS) $(OBJS)\treectrl_treetest.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(TREECTRL_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\treectrl_treetest.res | diff --git a/samples/treectrl/makefile.gcc b/samples/treectrl/makefile.gcc index 4251d3f..a2ae90a 100644 --- a/samples/treectrl/makefile.gcc +++ b/samples/treectrl/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TREECTRL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +TREECTRL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) TREECTRL_OBJECTS = \ $(OBJS)\treectrl_treetest.o \ $(OBJS)\treectrl_treetest_rc.o diff --git a/samples/treectrl/makefile.vc b/samples/treectrl/makefile.vc index ddb0919..c7059d2 100644 --- a/samples/treectrl/makefile.vc +++ b/samples/treectrl/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TREECTRL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\treectrl.pdb $(____DEBUGRUNTIME_2_p) \ +TREECTRL_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\treectrl.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) TREECTRL_OBJECTS = \ $(OBJS)\treectrl_treetest.obj \ $(OBJS)\treectrl_treetest.res diff --git a/samples/treectrl/makefile.wat b/samples/treectrl/makefile.wat index cc0192a..6b66455 100644 --- a/samples/treectrl/makefile.wat +++ b/samples/treectrl/makefile.wat @@ -171,10 +171,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TREECTRL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +TREECTRL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) TREECTRL_OBJECTS = & $(OBJS)\treectrl_treetest.obj diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in index 8361a43..fa37f76 100644 --- a/samples/typetest/Makefile.in +++ b/samples/typetest/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -TYPETEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +TYPETEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) TYPETEST_OBJECTS = \ $(__typetest_os2_lib_res) \ typetest_typetest.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o typetest$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o typetest$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ typetest_typetest.o: $(srcdir)/typetest.cpp $(CXXC) -c -o $@ $(TYPETEST_CXXFLAGS) $< typetest_typetest_rc.o: $(srcdir)/typetest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: diff --git a/samples/typetest/makefile.bcc b/samples/typetest/makefile.bcc index 7393500..be96a46 100644 --- a/samples/typetest/makefile.bcc +++ b/samples/typetest/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,16 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TYPETEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +TYPETEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) TYPETEST_OBJECTS = \ $(OBJS)\typetest_typetest.obj @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\typetest.ils del $(OBJS)\typetest.ils $(OBJS)\typetest.exe: $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(TYPETEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\typetest_typetest.res | diff --git a/samples/typetest/makefile.gcc b/samples/typetest/makefile.gcc index 22a8a66..8782a39 100644 --- a/samples/typetest/makefile.gcc +++ b/samples/typetest/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TYPETEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +TYPETEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) TYPETEST_OBJECTS = \ $(OBJS)\typetest_typetest.o \ $(OBJS)\typetest_typetest_rc.o diff --git a/samples/typetest/makefile.vc b/samples/typetest/makefile.vc index 2d53283..896ab7b 100644 --- a/samples/typetest/makefile.vc +++ b/samples/typetest/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TYPETEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\typetest.pdb $(____DEBUGRUNTIME_2_p) \ +TYPETEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\typetest.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) TYPETEST_OBJECTS = \ $(OBJS)\typetest_typetest.obj \ $(OBJS)\typetest_typetest.res diff --git a/samples/typetest/makefile.wat b/samples/typetest/makefile.wat index 2d11e43..c515d3b 100644 --- a/samples/typetest/makefile.wat +++ b/samples/typetest/makefile.wat @@ -171,10 +171,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TYPETEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +TYPETEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) TYPETEST_OBJECTS = & $(OBJS)\typetest_typetest.obj diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in index c5ddcf2..c96e747 100644 --- a/samples/validate/Makefile.in +++ b/samples/validate/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -VALIDATE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +VALIDATE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) VALIDATE_OBJECTS = \ $(__validate_os2_lib_res) \ validate_validate.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o validate$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o validate$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -156,7 +155,7 @@ validate_validate.o: $(srcdir)/validate.cpp $(CXXC) -c -o $@ $(VALIDATE_CXXFLAGS) $< validate_validate_rc.o: $(srcdir)/validate.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples # Include dependency info, if present: diff --git a/samples/validate/makefile.bcc b/samples/validate/makefile.bcc index 24cac86..bb46d76 100644 --- a/samples/validate/makefile.bcc +++ b/samples/validate/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,16 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -VALIDATE_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +VALIDATE_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) VALIDATE_OBJECTS = \ $(OBJS)\validate_validate.obj @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\validate.ils del $(OBJS)\validate.ils $(OBJS)\validate.exe: $(VALIDATE_OBJECTS) $(OBJS)\validate_validate.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(VALIDATE_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\validate_validate.res | diff --git a/samples/validate/makefile.gcc b/samples/validate/makefile.gcc index 740988e..e86ee6b 100644 --- a/samples/validate/makefile.gcc +++ b/samples/validate/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -VALIDATE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +VALIDATE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) VALIDATE_OBJECTS = \ $(OBJS)\validate_validate.o \ $(OBJS)\validate_validate_rc.o diff --git a/samples/validate/makefile.vc b/samples/validate/makefile.vc index 494ca36..83bd3bb 100644 --- a/samples/validate/makefile.vc +++ b/samples/validate/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -VALIDATE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\validate.pdb $(____DEBUGRUNTIME_2_p) \ +VALIDATE_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\validate.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) VALIDATE_OBJECTS = \ $(OBJS)\validate_validate.obj \ $(OBJS)\validate_validate.res diff --git a/samples/validate/makefile.wat b/samples/validate/makefile.wat index 966af82..2303d39 100644 --- a/samples/validate/makefile.wat +++ b/samples/validate/makefile.wat @@ -171,10 +171,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -VALIDATE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +VALIDATE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) VALIDATE_OBJECTS = & $(OBJS)\validate_validate.obj diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in index 9bbc12b..23c8831 100644 --- a/samples/vscroll/Makefile.in +++ b/samples/vscroll/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -VSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +VSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) VSTEST_OBJECTS = \ $(__vstest___win32rc) \ $(__vstest_os2_lib_res) \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o vstest$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o vstest$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -153,7 +152,7 @@ vstest.app/Contents/PkgInfo: vstest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in @COND_PLATFORM_MACOSX_1@vstest_bundle: vstest.app/Contents/PkgInfo vstest_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples vstest_vstest.o: $(srcdir)/vstest.cpp $(CXXC) -c -o $@ $(VSTEST_CXXFLAGS) $< diff --git a/samples/vscroll/makefile.bcc b/samples/vscroll/makefile.bcc index c6d0036..f963a47 100644 --- a/samples/vscroll/makefile.bcc +++ b/samples/vscroll/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,16 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -VSTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +VSTEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) VSTEST_OBJECTS = \ $(OBJS)\vstest_vstest.obj @@ -170,6 +171,6 @@ clean: -if exist $(OBJS)\vstest.ils del $(OBJS)\vstest.ils $(OBJS)\vstest.exe: $(VSTEST_OBJECTS) $(OBJS)\vstest_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(VSTEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\vstest_sample.res | diff --git a/samples/vscroll/makefile.gcc b/samples/vscroll/makefile.gcc index 87cbe9a..e9ebf3a 100644 --- a/samples/vscroll/makefile.gcc +++ b/samples/vscroll/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -VSTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +VSTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) VSTEST_OBJECTS = \ $(OBJS)\vstest_sample_rc.o \ $(OBJS)\vstest_vstest.o diff --git a/samples/vscroll/makefile.vc b/samples/vscroll/makefile.vc index 6c52298..7960987 100644 --- a/samples/vscroll/makefile.vc +++ b/samples/vscroll/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -VSTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +VSTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\vstest.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) VSTEST_OBJECTS = \ $(OBJS)\vstest_sample.res \ $(OBJS)\vstest_vstest.obj diff --git a/samples/vscroll/makefile.wat b/samples/vscroll/makefile.wat index ab90ff9..853008b 100644 --- a/samples/vscroll/makefile.wat +++ b/samples/vscroll/makefile.wat @@ -171,10 +171,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -VSTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +VSTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) VSTEST_OBJECTS = & $(OBJS)\vstest_vstest.obj diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in index 11bbb10..ca92a7c 100644 --- a/samples/widgets/Makefile.in +++ b/samples/widgets/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WIDGETS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +WIDGETS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) WIDGETS_OBJECTS = \ $(__widgets_os2_lib_res) \ widgets_button.o \ @@ -88,8 +87,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o widgets$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o widgets$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -200,7 +199,7 @@ widgets_widgets.o: $(srcdir)/widgets.cpp $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $< widgets_widgets_rc.o: $(srcdir)/widgets.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples # Include dependency info, if present: diff --git a/samples/widgets/makefile.bcc b/samples/widgets/makefile.bcc index a6cfc74..e910547 100644 --- a/samples/widgets/makefile.bcc +++ b/samples/widgets/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,16 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WIDGETS_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +WIDGETS_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) WIDGETS_OBJECTS = \ $(OBJS)\widgets_button.obj \ $(OBJS)\widgets_checkbox.obj \ @@ -214,6 +215,6 @@ clean: -if exist $(OBJS)\widgets.ils del $(OBJS)\widgets.ils $(OBJS)\widgets.exe: $(WIDGETS_OBJECTS) $(OBJS)\widgets_widgets.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(WIDGETS_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\widgets_widgets.res | diff --git a/samples/widgets/makefile.gcc b/samples/widgets/makefile.gcc index ee895c6..f34fad8 100644 --- a/samples/widgets/makefile.gcc +++ b/samples/widgets/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WIDGETS_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +WIDGETS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) WIDGETS_OBJECTS = \ $(OBJS)\widgets_button.o \ $(OBJS)\widgets_checkbox.o \ diff --git a/samples/widgets/makefile.vc b/samples/widgets/makefile.vc index eeafbc6..90b3f89 100644 --- a/samples/widgets/makefile.vc +++ b/samples/widgets/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WIDGETS_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\widgets.pdb $(____DEBUGRUNTIME_2_p) \ +WIDGETS_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\widgets.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) WIDGETS_OBJECTS = \ $(OBJS)\widgets_button.obj \ $(OBJS)\widgets_checkbox.obj \ diff --git a/samples/widgets/makefile.wat b/samples/widgets/makefile.wat index e48a34a..f273d91 100644 --- a/samples/widgets/makefile.wat +++ b/samples/widgets/makefile.wat @@ -171,10 +171,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WIDGETS_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +WIDGETS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) WIDGETS_OBJECTS = & $(OBJS)\widgets_button.obj & $(OBJS)\widgets_checkbox.obj & diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in index e45b244..9e372b7 100644 --- a/samples/wizard/Makefile.in +++ b/samples/wizard/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WIZARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +WIZARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) WIZARD_OBJECTS = \ $(__wizard_os2_lib_res) \ wizard_wizard.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o wizard$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o wizard$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ @@ -159,7 +158,7 @@ wizard_wizard.o: $(srcdir)/wizard.cpp $(CXXC) -c -o $@ $(WIZARD_CXXFLAGS) $< wizard_wizard_rc.o: $(srcdir)/wizard.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples # Include dependency info, if present: diff --git a/samples/wizard/makefile.bcc b/samples/wizard/makefile.bcc index 960bf87..25ccdbb 100644 --- a/samples/wizard/makefile.bcc +++ b/samples/wizard/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,16 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WIZARD_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +WIZARD_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) WIZARD_OBJECTS = \ $(OBJS)\wizard_wizard.obj @@ -174,6 +175,6 @@ clean: -if exist $(OBJS)\wizard.ils del $(OBJS)\wizard.ils $(OBJS)\wizard.exe: $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(WIZARD_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\wizard_wizard.res | diff --git a/samples/wizard/makefile.gcc b/samples/wizard/makefile.gcc index 465b83b..7e369b2 100644 --- a/samples/wizard/makefile.gcc +++ b/samples/wizard/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WIZARD_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +WIZARD_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) WIZARD_OBJECTS = \ $(OBJS)\wizard_wizard.o \ $(OBJS)\wizard_wizard_rc.o diff --git a/samples/wizard/makefile.vc b/samples/wizard/makefile.vc index 078a29d..d887296 100644 --- a/samples/wizard/makefile.vc +++ b/samples/wizard/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WIZARD_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +WIZARD_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\wizard.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) WIZARD_OBJECTS = \ $(OBJS)\wizard_wizard.obj \ $(OBJS)\wizard_wizard.res diff --git a/samples/wizard/makefile.wat b/samples/wizard/makefile.wat index 0e9460c..5cb5ff9 100644 --- a/samples/wizard/makefile.wat +++ b/samples/wizard/makefile.wat @@ -176,10 +176,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WIZARD_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +WIZARD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) WIZARD_OBJECTS = & $(OBJS)\wizard_wizard.obj diff --git a/samples/wxtest/Makefile.in b/samples/wxtest/Makefile.in index a35a8c2..a3a85d2 100644 --- a/samples/wxtest/Makefile.in +++ b/samples/wxtest/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WXTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +WXTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) WXTEST_OBJECTS = \ $(__wxtest___win32rc) \ $(__wxtest_os2_lib_res) \ @@ -78,8 +77,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o wxtest$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o wxtest$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -154,7 +153,7 @@ wxtest.app/Contents/PkgInfo: wxtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in @COND_PLATFORM_MACOSX_1@wxtest_bundle: wxtest.app/Contents/PkgInfo wxtest_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples wxtest_test.o: $(srcdir)/test.cpp $(CXXC) -c -o $@ $(WXTEST_CXXFLAGS) $< diff --git a/samples/wxtest/makefile.bcc b/samples/wxtest/makefile.bcc index 4c92491..6afe3f7 100644 --- a/samples/wxtest/makefile.bcc +++ b/samples/wxtest/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,16 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +WXTEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) WXTEST_OBJECTS = \ $(OBJS)\wxtest_test.obj \ $(OBJS)\wxtest_test_wdr.obj @@ -174,6 +175,6 @@ clean: -if exist $(OBJS)\wxtest.ils del $(OBJS)\wxtest.ils $(OBJS)\wxtest.exe: $(WXTEST_OBJECTS) $(OBJS)\wxtest_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(WXTEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\wxtest_sample.res | diff --git a/samples/wxtest/makefile.gcc b/samples/wxtest/makefile.gcc index 93241c1..c308296 100644 --- a/samples/wxtest/makefile.gcc +++ b/samples/wxtest/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +WXTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) WXTEST_OBJECTS = \ $(OBJS)\wxtest_sample_rc.o \ $(OBJS)\wxtest_test.o \ diff --git a/samples/wxtest/makefile.vc b/samples/wxtest/makefile.vc index 7241b36..dfd5882 100644 --- a/samples/wxtest/makefile.vc +++ b/samples/wxtest/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +WXTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\wxtest.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) WXTEST_OBJECTS = \ $(OBJS)\wxtest_sample.res \ $(OBJS)\wxtest_test.obj \ diff --git a/samples/wxtest/makefile.wat b/samples/wxtest/makefile.wat index 75c28f7..2d9ae10 100644 --- a/samples/wxtest/makefile.wat +++ b/samples/wxtest/makefile.wat @@ -171,10 +171,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +WXTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) WXTEST_OBJECTS = & $(OBJS)\wxtest_test.obj & $(OBJS)\wxtest_test_wdr.obj diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in index 2c70c4b..112a388 100644 --- a/samples/xrc/Makefile.in +++ b/samples/xrc/Makefile.in @@ -39,10 +39,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib WX_VERSION = 2.5.1 -XRCDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \ - $(CXXFLAGS) +XRCDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ + $(CPPFLAGS) $(CXXFLAGS) XRCDEMO_OBJECTS = \ $(__xrcdemo_os2_lib_res) \ xrcdemo_xrcdemo.o \ @@ -83,10 +82,9 @@ XRCDEMO_OBJECTS = \ @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \ - xrcdemo$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \ - sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -i $(srcdir)/../../include -o xrcdemo$(EXEEXT) \ + Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX) @@ -188,7 +186,7 @@ xrcdemo_xrcdemo.o: $(srcdir)/xrcdemo.cpp $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $< xrcdemo_xrcdemo_rc.o: $(srcdir)/xrcdemo.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include # Include dependency info, if present: diff --git a/samples/xrc/makefile.bcc b/samples/xrc/makefile.bcc index f71d351..47bc7a6 100644 --- a/samples/xrc/makefile.bcc +++ b/samples/xrc/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,21 +19,17 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +XRCDEMO_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \ - $(CXXFLAGS) + $(CPPFLAGS) $(CXXFLAGS) XRCDEMO_OBJECTS = \ $(OBJS)\xrcdemo_xrcdemo.obj \ $(OBJS)\xrcdemo_myframe.obj \ @@ -198,6 +199,6 @@ data: for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(XRCDEMO_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\xrcdemo_xrcdemo.res | diff --git a/samples/xrc/makefile.gcc b/samples/xrc/makefile.gcc index c4696dd..3017fae 100644 --- a/samples/xrc/makefile.gcc +++ b/samples/xrc/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +XRCDEMO_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) XRCDEMO_OBJECTS = \ $(OBJS)\xrcdemo_xrcdemo.o \ $(OBJS)\xrcdemo_myframe.o \ diff --git a/samples/xrc/makefile.vc b/samples/xrc/makefile.vc index da291e7..fd23291 100644 --- a/samples/xrc/makefile.vc +++ b/samples/xrc/makefile.vc @@ -16,12 +16,13 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -XRCDEMO_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\xrcdemo.pdb $(____DEBUGRUNTIME_2_p) \ +XRCDEMO_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\xrcdemo.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - /I.\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /I.\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) \ + $(CXXFLAGS) XRCDEMO_OBJECTS = \ $(OBJS)\xrcdemo_xrcdemo.obj \ $(OBJS)\xrcdemo_myframe.obj \ diff --git a/samples/xrc/makefile.wat b/samples/xrc/makefile.wat index ecf88fd..970f969 100644 --- a/samples/xrc/makefile.wat +++ b/samples/xrc/makefile.wat @@ -185,11 +185,11 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include $(CXXFLAGS) & - $(__EXCEPTIONSFLAG_7) +XRCDEMO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -i=.\..\..\include $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) & + $(CXXFLAGS) XRCDEMO_OBJECTS = & $(OBJS)\xrcdemo_xrcdemo.obj & $(OBJS)\xrcdemo_myframe.obj & diff --git a/src/stc/Makefile.in b/src/stc/Makefile.in index 12fc8e2..7405600 100644 --- a/src/stc/Makefile.in +++ b/src/stc/Makefile.in @@ -45,10 +45,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib STCDLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -I$(srcdir)/scintilla/include -I$(srcdir)/scintilla/src -D__WX__ \ - -DSCI_LEXER -DLINK_LEXERS -DWXUSINGDLL -DWXMAKINGDLL_STC $(PIC_FLAG) \ - $(CPPFLAGS) $(CXXFLAGS) + -I$(srcdir)/../../include -I$(srcdir)/scintilla/include \ + -I$(srcdir)/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS -DWXUSINGDLL \ + -DWXMAKINGDLL_STC $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) STCDLL_OBJECTS = \ stcdll_PlatWX.o \ stcdll_ScintillaWX.o \ @@ -104,9 +103,9 @@ STCDLL_OBJECTS = \ stcdll_WindowAccessor.o \ stcdll_XPM.o STCLIB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -I$(srcdir)/scintilla/include -I$(srcdir)/scintilla/src -D__WX__ \ - -DSCI_LEXER -DLINK_LEXERS $(CPPFLAGS) $(CXXFLAGS) + -I$(srcdir)/../../include -I$(srcdir)/scintilla/include \ + -I$(srcdir)/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CPPFLAGS) \ + $(CXXFLAGS) STCLIB_OBJECTS = \ stclib_PlatWX.o \ stclib_ScintillaWX.o \ diff --git a/src/xrc/Makefile.in b/src/xrc/Makefile.in index d465aca..d6a56de 100644 --- a/src/xrc/Makefile.in +++ b/src/xrc/Makefile.in @@ -48,8 +48,8 @@ DESTDIR = LIBDIRNAME = $(top_builddir)lib WX_VERSION = 2.5.1 XRCDLL_CXXFLAGS = $(__xrcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir)/../../include -DWXUSINGDLL \ - -DWXMAKINGDLL_XRC $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) + -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_XRC $(PIC_FLAG) \ + $(CPPFLAGS) $(CXXFLAGS) XRCDLL_OBJECTS = \ xrcdll_xmlres.o \ xrcdll_xh_bmp.o \ @@ -88,9 +88,10 @@ XRCDLL_OBJECTS = \ xrcdll_xh_unkwn.o \ xrcdll_xh_wizrd.o \ xrcdll_xmlrsall.o +XRCDLL_ODEP = $(___pch_wxprec_xrcdll_wx_wxprec_h_gch___depname) XRCLIB_CXXFLAGS = $(__xrclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir)/../../include \ - -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CPPFLAGS) $(CXXFLAGS) + -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse \ + -I$(srcdir)/expat/xmltok $(CPPFLAGS) $(CXXFLAGS) XRCLIB_OBJECTS = \ xrclib_xmlres.o \ xrclib_xh_bmp.o \ @@ -129,6 +130,7 @@ XRCLIB_OBJECTS = \ xrclib_xh_unkwn.o \ xrclib_xh_wizrd.o \ xrclib_xmlrsall.o +XRCLIB_ODEP = $(___pch_wxprec_xrclib_wx_wxprec_h_gch___depname) ### Conditionally set variables: ### @@ -184,9 +186,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_MONOLITHIC_0@__WXLIB_XML_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_GCC_PCH_1@___pch_wxprec_xrcdll_wx_wxprec_h_gch___depname \ +@COND_GCC_PCH_1@ = .pch/wxprec_xrcdll/wx/wxprec.h.gch +@COND_GCC_PCH_1@___pch_wxprec_xrclib_wx_wxprec_h_gch___depname \ +@COND_GCC_PCH_1@ = .pch/wxprec_xrclib/wx/wxprec.h.gch @COND_SHARED_1@__install_xrcdll___depname = install_xrcdll @COND_SHARED_0@__install_xrclib___depname = install_xrclib -@COND_GCC_PCH_1@__xrcdll_PCH_DEP = .pch/wxprec_xrcdll/wx/wxprec.h.gch @COND_GCC_PCH_1@__xrcdll_PCH_INC = -I.pch/wxprec_xrcdll COND_SHARED_1___xrcdll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) @@ -236,7 +241,6 @@ COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags = \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .1.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__xrcdll___targetsuf3 = .$(SO_SUFFIX) -@COND_GCC_PCH_1@__xrclib_PCH_DEP = .pch/wxprec_xrclib/wx/wxprec.h.gch @COND_GCC_PCH_1@__xrclib_PCH_INC = -I.pch/wxprec_xrclib COND_SHARED_0___xrclib___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a @@ -287,236 +291,236 @@ install-strip: install uninstall: -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): $(__xrcdll_PCH_DEP) $(XRCDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): $(XRCDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(__xrcdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) @COND_SHARED_1@ @COND_SHARED_1@ $(__xrcdll___so_symlinks_cmd) -xrcdll_xh_bmp.o: $(srcdir)/xh_bmp.cpp +xrcdll_xh_bmp.o: $(srcdir)/xh_bmp.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp +xrcdll_xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_bttn.o: $(srcdir)/xh_bttn.cpp +xrcdll_xh_bttn.o: $(srcdir)/xh_bttn.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_cald.o: $(srcdir)/xh_cald.cpp +xrcdll_xh_cald.o: $(srcdir)/xh_cald.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_chckb.o: $(srcdir)/xh_chckb.cpp +xrcdll_xh_chckb.o: $(srcdir)/xh_chckb.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_chckl.o: $(srcdir)/xh_chckl.cpp +xrcdll_xh_chckl.o: $(srcdir)/xh_chckl.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_choic.o: $(srcdir)/xh_choic.cpp +xrcdll_xh_choic.o: $(srcdir)/xh_choic.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_combo.o: $(srcdir)/xh_combo.cpp +xrcdll_xh_combo.o: $(srcdir)/xh_combo.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_dlg.o: $(srcdir)/xh_dlg.cpp +xrcdll_xh_dlg.o: $(srcdir)/xh_dlg.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_frame.o: $(srcdir)/xh_frame.cpp +xrcdll_xh_frame.o: $(srcdir)/xh_frame.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_gauge.o: $(srcdir)/xh_gauge.cpp +xrcdll_xh_gauge.o: $(srcdir)/xh_gauge.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_gdctl.o: $(srcdir)/xh_gdctl.cpp +xrcdll_xh_gdctl.o: $(srcdir)/xh_gdctl.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_html.o: $(srcdir)/xh_html.cpp +xrcdll_xh_html.o: $(srcdir)/xh_html.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_listb.o: $(srcdir)/xh_listb.cpp +xrcdll_xh_listb.o: $(srcdir)/xh_listb.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_listc.o: $(srcdir)/xh_listc.cpp +xrcdll_xh_listc.o: $(srcdir)/xh_listc.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_menu.o: $(srcdir)/xh_menu.cpp +xrcdll_xh_menu.o: $(srcdir)/xh_menu.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_notbk.o: $(srcdir)/xh_notbk.cpp +xrcdll_xh_notbk.o: $(srcdir)/xh_notbk.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_panel.o: $(srcdir)/xh_panel.cpp +xrcdll_xh_panel.o: $(srcdir)/xh_panel.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_radbt.o: $(srcdir)/xh_radbt.cpp +xrcdll_xh_radbt.o: $(srcdir)/xh_radbt.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_radbx.o: $(srcdir)/xh_radbx.cpp +xrcdll_xh_radbx.o: $(srcdir)/xh_radbx.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_scrol.o: $(srcdir)/xh_scrol.cpp +xrcdll_xh_scrol.o: $(srcdir)/xh_scrol.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_scwin.o: $(srcdir)/xh_scwin.cpp +xrcdll_xh_scwin.o: $(srcdir)/xh_scwin.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_sizer.o: $(srcdir)/xh_sizer.cpp +xrcdll_xh_sizer.o: $(srcdir)/xh_sizer.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_slidr.o: $(srcdir)/xh_slidr.cpp +xrcdll_xh_slidr.o: $(srcdir)/xh_slidr.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_spin.o: $(srcdir)/xh_spin.cpp +xrcdll_xh_spin.o: $(srcdir)/xh_spin.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_split.o: $(srcdir)/xh_split.cpp +xrcdll_xh_split.o: $(srcdir)/xh_split.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_stbmp.o: $(srcdir)/xh_stbmp.cpp +xrcdll_xh_stbmp.o: $(srcdir)/xh_stbmp.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_stbox.o: $(srcdir)/xh_stbox.cpp +xrcdll_xh_stbox.o: $(srcdir)/xh_stbox.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_stlin.o: $(srcdir)/xh_stlin.cpp +xrcdll_xh_stlin.o: $(srcdir)/xh_stlin.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_sttxt.o: $(srcdir)/xh_sttxt.cpp +xrcdll_xh_sttxt.o: $(srcdir)/xh_sttxt.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_text.o: $(srcdir)/xh_text.cpp +xrcdll_xh_text.o: $(srcdir)/xh_text.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_toolb.o: $(srcdir)/xh_toolb.cpp +xrcdll_xh_toolb.o: $(srcdir)/xh_toolb.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_tree.o: $(srcdir)/xh_tree.cpp +xrcdll_xh_tree.o: $(srcdir)/xh_tree.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_unkwn.o: $(srcdir)/xh_unkwn.cpp +xrcdll_xh_unkwn.o: $(srcdir)/xh_unkwn.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xh_wizrd.o: $(srcdir)/xh_wizrd.cpp +xrcdll_xh_wizrd.o: $(srcdir)/xh_wizrd.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xmlres.o: $(srcdir)/xmlres.cpp +xrcdll_xmlres.o: $(srcdir)/xmlres.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrcdll_xmlrsall.o: $(srcdir)/xmlrsall.cpp +xrcdll_xmlrsall.o: $(srcdir)/xmlrsall.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a: $(__xrclib_PCH_DEP) $(XRCLIB_OBJECTS) +@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a: $(XRCLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ $(XRCLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ -xrclib_xh_bmp.o: $(srcdir)/xh_bmp.cpp +xrclib_xh_bmp.o: $(srcdir)/xh_bmp.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp +xrclib_xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_bttn.o: $(srcdir)/xh_bttn.cpp +xrclib_xh_bttn.o: $(srcdir)/xh_bttn.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_cald.o: $(srcdir)/xh_cald.cpp +xrclib_xh_cald.o: $(srcdir)/xh_cald.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_chckb.o: $(srcdir)/xh_chckb.cpp +xrclib_xh_chckb.o: $(srcdir)/xh_chckb.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_chckl.o: $(srcdir)/xh_chckl.cpp +xrclib_xh_chckl.o: $(srcdir)/xh_chckl.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_choic.o: $(srcdir)/xh_choic.cpp +xrclib_xh_choic.o: $(srcdir)/xh_choic.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_combo.o: $(srcdir)/xh_combo.cpp +xrclib_xh_combo.o: $(srcdir)/xh_combo.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_dlg.o: $(srcdir)/xh_dlg.cpp +xrclib_xh_dlg.o: $(srcdir)/xh_dlg.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_frame.o: $(srcdir)/xh_frame.cpp +xrclib_xh_frame.o: $(srcdir)/xh_frame.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_gauge.o: $(srcdir)/xh_gauge.cpp +xrclib_xh_gauge.o: $(srcdir)/xh_gauge.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_gdctl.o: $(srcdir)/xh_gdctl.cpp +xrclib_xh_gdctl.o: $(srcdir)/xh_gdctl.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_html.o: $(srcdir)/xh_html.cpp +xrclib_xh_html.o: $(srcdir)/xh_html.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_listb.o: $(srcdir)/xh_listb.cpp +xrclib_xh_listb.o: $(srcdir)/xh_listb.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_listc.o: $(srcdir)/xh_listc.cpp +xrclib_xh_listc.o: $(srcdir)/xh_listc.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_menu.o: $(srcdir)/xh_menu.cpp +xrclib_xh_menu.o: $(srcdir)/xh_menu.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_notbk.o: $(srcdir)/xh_notbk.cpp +xrclib_xh_notbk.o: $(srcdir)/xh_notbk.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_panel.o: $(srcdir)/xh_panel.cpp +xrclib_xh_panel.o: $(srcdir)/xh_panel.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_radbt.o: $(srcdir)/xh_radbt.cpp +xrclib_xh_radbt.o: $(srcdir)/xh_radbt.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_radbx.o: $(srcdir)/xh_radbx.cpp +xrclib_xh_radbx.o: $(srcdir)/xh_radbx.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_scrol.o: $(srcdir)/xh_scrol.cpp +xrclib_xh_scrol.o: $(srcdir)/xh_scrol.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_scwin.o: $(srcdir)/xh_scwin.cpp +xrclib_xh_scwin.o: $(srcdir)/xh_scwin.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_sizer.o: $(srcdir)/xh_sizer.cpp +xrclib_xh_sizer.o: $(srcdir)/xh_sizer.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_slidr.o: $(srcdir)/xh_slidr.cpp +xrclib_xh_slidr.o: $(srcdir)/xh_slidr.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_spin.o: $(srcdir)/xh_spin.cpp +xrclib_xh_spin.o: $(srcdir)/xh_spin.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_split.o: $(srcdir)/xh_split.cpp +xrclib_xh_split.o: $(srcdir)/xh_split.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_stbmp.o: $(srcdir)/xh_stbmp.cpp +xrclib_xh_stbmp.o: $(srcdir)/xh_stbmp.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_stbox.o: $(srcdir)/xh_stbox.cpp +xrclib_xh_stbox.o: $(srcdir)/xh_stbox.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_stlin.o: $(srcdir)/xh_stlin.cpp +xrclib_xh_stlin.o: $(srcdir)/xh_stlin.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_sttxt.o: $(srcdir)/xh_sttxt.cpp +xrclib_xh_sttxt.o: $(srcdir)/xh_sttxt.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_text.o: $(srcdir)/xh_text.cpp +xrclib_xh_text.o: $(srcdir)/xh_text.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_toolb.o: $(srcdir)/xh_toolb.cpp +xrclib_xh_toolb.o: $(srcdir)/xh_toolb.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_tree.o: $(srcdir)/xh_tree.cpp +xrclib_xh_tree.o: $(srcdir)/xh_tree.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_unkwn.o: $(srcdir)/xh_unkwn.cpp +xrclib_xh_unkwn.o: $(srcdir)/xh_unkwn.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xh_wizrd.o: $(srcdir)/xh_wizrd.cpp +xrclib_xh_wizrd.o: $(srcdir)/xh_wizrd.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xmlres.o: $(srcdir)/xmlres.cpp +xrclib_xmlres.o: $(srcdir)/xmlres.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib_xmlrsall.o: $(srcdir)/xmlrsall.cpp +xrclib_xmlrsall.o: $(srcdir)/xmlrsall.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< diff --git a/utils/HelpGen/src/Makefile.in b/utils/HelpGen/src/Makefile.in index 0477972..ed4072d 100644 --- a/utils/HelpGen/src/Makefile.in +++ b/utils/HelpGen/src/Makefile.in @@ -28,8 +28,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -HELPGEN_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS) +HELPGEN_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS) HELPGEN_OBJECTS = \ HelpGen_HelpGen.o \ HelpGen_cjparser.o \ diff --git a/utils/HelpGen/src/makefile.bcc b/utils/HelpGen/src/makefile.bcc index 065bcd8..bf9d24e 100644 --- a/utils/HelpGen/src/makefile.bcc +++ b/utils/HelpGen/src/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -HELPGEN_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +HELPGEN_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) $(CXXFLAGS) + -I$(SETUPHDIR) -I. $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS) HELPGEN_OBJECTS = \ $(OBJS)\HelpGen_HelpGen.obj \ $(OBJS)\HelpGen_cjparser.obj \ @@ -166,7 +167,7 @@ $(OBJS)\HelpGen_srcparser.obj: .\srcparser.cpp $(CXX) -q -c -P -o$@ $(HELPGEN_CXXFLAGS) $** $(OBJS)\HelpGen.exe: $(HELPGEN_OBJECTS) - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&| c0x32.obj $(HELPGEN_OBJECTS),$@,, $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, | diff --git a/utils/HelpGen/src/makefile.gcc b/utils/HelpGen/src/makefile.gcc index 3a8b420..daf528a 100644 --- a/utils/HelpGen/src/makefile.gcc +++ b/utils/HelpGen/src/makefile.gcc @@ -12,10 +12,11 @@ include ../../../build/msw/config.gcc ### Variables: ### -HELPGEN_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +HELPGEN_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) \ + $(CXXFLAGS) HELPGEN_OBJECTS = \ $(OBJS)\HelpGen_HelpGen.o \ $(OBJS)\HelpGen_cjparser.o \ diff --git a/utils/HelpGen/src/makefile.vc b/utils/HelpGen/src/makefile.vc index 20d4d9a..dd2c363 100644 --- a/utils/HelpGen/src/makefile.vc +++ b/utils/HelpGen/src/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -HELPGEN_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\HelpGen.pdb $(____DEBUGRUNTIME_2_p) \ +HELPGEN_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\HelpGen.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ - /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) HELPGEN_OBJECTS = \ $(OBJS)\HelpGen_HelpGen.obj \ $(OBJS)\HelpGen_cjparser.obj \ diff --git a/utils/HelpGen/src/makefile.wat b/utils/HelpGen/src/makefile.wat index d2bd0f6..7b106aa 100644 --- a/utils/HelpGen/src/makefile.wat +++ b/utils/HelpGen/src/makefile.wat @@ -162,10 +162,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -HELPGEN_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +HELPGEN_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) HELPGEN_OBJECTS = & $(OBJS)\HelpGen_HelpGen.obj & $(OBJS)\HelpGen_cjparser.obj & diff --git a/utils/configtool/src/Makefile.in b/utils/configtool/src/Makefile.in index ca4e30c..b7d9e05 100644 --- a/utils/configtool/src/Makefile.in +++ b/utils/configtool/src/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WXCONFIGTOOL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) +WXCONFIGTOOL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) WXCONFIGTOOL_OBJECTS = \ $(__wxconfigtool___win32rc) \ $(__wxconfigtool_os2_lib_res) \ @@ -89,9 +88,9 @@ WXCONFIGTOOL_OBJECTS = \ @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o wxconfigtool$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -o wxconfigtool$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX) @@ -190,7 +189,7 @@ wxconfigtool_property.o: $(srcdir)/property.cpp $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< wxconfigtool_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples wxconfigtool_settingsdialog.o: $(srcdir)/settingsdialog.cpp $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< diff --git a/utils/configtool/src/makefile.bcc b/utils/configtool/src/makefile.bcc index 0a71301..d013383 100644 --- a/utils/configtool/src/makefile.bcc +++ b/utils/configtool/src/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,17 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXCONFIGTOOL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +WXCONFIGTOOL_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) + -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CPPFLAGS) \ + $(CXXFLAGS) WXCONFIGTOOL_OBJECTS = \ $(OBJS)\wxconfigtool_wxconfigtool.obj \ $(OBJS)\wxconfigtool_appsettings.obj \ @@ -237,6 +239,6 @@ data: for %f in (wxwin250.wxs) do if not exist $(OBJS)\%f copy .\..\configs\%f $(OBJS) $(OBJS)\wxconfigtool.exe: $(WXCONFIGTOOL_OBJECTS) $(OBJS)\wxconfigtool_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(WXCONFIGTOOL_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\wxconfigtool_sample.res | diff --git a/utils/configtool/src/makefile.gcc b/utils/configtool/src/makefile.gcc index d49bd5f..2b5a49a 100644 --- a/utils/configtool/src/makefile.gcc +++ b/utils/configtool/src/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXCONFIGTOOL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) +WXCONFIGTOOL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ + $(__DLLFLAG_p) -I.\..\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) WXCONFIGTOOL_OBJECTS = \ $(OBJS)\wxconfigtool_sample_rc.o \ $(OBJS)\wxconfigtool_wxconfigtool.o \ diff --git a/utils/configtool/src/makefile.vc b/utils/configtool/src/makefile.vc index 905e21e..3e5b406 100644 --- a/utils/configtool/src/makefile.vc +++ b/utils/configtool/src/makefile.vc @@ -16,13 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXCONFIGTOOL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\wxconfigtool.pdb \ - $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - /I.\..\..\..\include /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ - /I.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) \ - $(__EXCEPTIONSFLAG_9) +WXCONFIGTOOL_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\wxconfigtool.pdb $(____DEBUGRUNTIME_2_p) \ + $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ + /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ + $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) WXCONFIGTOOL_OBJECTS = \ $(OBJS)\wxconfigtool_sample.res \ $(OBJS)\wxconfigtool_wxconfigtool.obj \ diff --git a/utils/configtool/src/makefile.wat b/utils/configtool/src/makefile.wat index 70f9724..0e8ce33 100644 --- a/utils/configtool/src/makefile.wat +++ b/utils/configtool/src/makefile.wat @@ -185,10 +185,11 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXCONFIGTOOL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +WXCONFIGTOOL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + $(__DLLFLAG_p) -i=.\..\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) & + $(CXXFLAGS) WXCONFIGTOOL_OBJECTS = & $(OBJS)\wxconfigtool_wxconfigtool.obj & $(OBJS)\wxconfigtool_appsettings.obj & diff --git a/utils/emulator/src/Makefile.in b/utils/emulator/src/Makefile.in index 5898fdd..37f1aa3 100644 --- a/utils/emulator/src/Makefile.in +++ b/utils/emulator/src/Makefile.in @@ -34,9 +34,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WXEMULATOR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) +WXEMULATOR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) WXEMULATOR_OBJECTS = \ $(__wxemulator___win32rc) \ $(__wxemulator_os2_lib_res) \ @@ -74,9 +73,9 @@ WXEMULATOR_OBJECTS = \ @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o wxemulator$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -o wxemulator$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -135,7 +134,7 @@ wxemulator_emulator.o: $(srcdir)/emulator.cpp $(CXXC) -c -o $@ $(WXEMULATOR_CXXFLAGS) $< wxemulator_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples # Include dependency info, if present: diff --git a/utils/emulator/src/makefile.bcc b/utils/emulator/src/makefile.bcc index 8767571..9242dc6 100644 --- a/utils/emulator/src/makefile.bcc +++ b/utils/emulator/src/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,17 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXEMULATOR_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +WXEMULATOR_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) + -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CPPFLAGS) \ + $(CXXFLAGS) WXEMULATOR_OBJECTS = \ $(OBJS)\wxemulator_emulator.obj @@ -174,6 +176,6 @@ data: for %f in (default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(WXEMULATOR_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\wxemulator_sample.res | diff --git a/utils/emulator/src/makefile.gcc b/utils/emulator/src/makefile.gcc index 9997f7a..513082d 100644 --- a/utils/emulator/src/makefile.gcc +++ b/utils/emulator/src/makefile.gcc @@ -16,11 +16,11 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXEMULATOR_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) +WXEMULATOR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ + $(__DLLFLAG_p) -I.\..\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) WXEMULATOR_OBJECTS = \ $(OBJS)\wxemulator_sample_rc.o \ $(OBJS)\wxemulator_emulator.o diff --git a/utils/emulator/src/makefile.vc b/utils/emulator/src/makefile.vc index aa2136f..65a16ef 100644 --- a/utils/emulator/src/makefile.vc +++ b/utils/emulator/src/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXEMULATOR_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\wxemulator.pdb $(____DEBUGRUNTIME_2_p) \ +WXEMULATOR_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\wxemulator.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) WXEMULATOR_OBJECTS = \ $(OBJS)\wxemulator_sample.res \ $(OBJS)\wxemulator_emulator.obj diff --git a/utils/emulator/src/makefile.wat b/utils/emulator/src/makefile.wat index 156707c..013a50b 100644 --- a/utils/emulator/src/makefile.wat +++ b/utils/emulator/src/makefile.wat @@ -171,10 +171,11 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXEMULATOR_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +WXEMULATOR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + $(__DLLFLAG_p) -i=.\..\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) & + $(CXXFLAGS) WXEMULATOR_OBJECTS = & $(OBJS)\wxemulator_emulator.obj diff --git a/utils/helpview/src/Makefile.in b/utils/helpview/src/Makefile.in index e34c331..19e0211 100644 --- a/utils/helpview/src/Makefile.in +++ b/utils/helpview/src/Makefile.in @@ -38,9 +38,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) +HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) HELPVIEW_OBJECTS = \ $(__helpview_os2_lib_res) \ helpview_helpview.o \ @@ -79,8 +78,8 @@ LIBDIRNAME = $(top_builddir)lib @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o helpview$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples -o helpview$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -139,7 +138,7 @@ helpview_helpview.o: $(srcdir)/helpview.cpp $(CXXC) -c -o $@ $(HELPVIEW_CXXFLAGS) $< helpview_helpview_rc.o: $(srcdir)/helpview.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples install: all install_helpview diff --git a/utils/helpview/src/makefile.bcc b/utils/helpview/src/makefile.bcc index bf6aee4..afff52f 100644 --- a/utils/helpview/src/makefile.bcc +++ b/utils/helpview/src/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,13 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -HELPVIEW_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +HELPVIEW_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) + -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CPPFLAGS) \ + $(CXXFLAGS) HELPVIEW_OBJECTS = \ $(OBJS)\helpview_helpview.obj OBJS = \ @@ -181,6 +183,6 @@ data: for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(HELPVIEW_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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\helpview_helpview.res | diff --git a/utils/helpview/src/makefile.gcc b/utils/helpview/src/makefile.gcc index 7dc6466..9a9d32b 100644 --- a/utils/helpview/src/makefile.gcc +++ b/utils/helpview/src/makefile.gcc @@ -12,11 +12,11 @@ include ../../../build/msw/config.gcc ### Variables: ### -HELPVIEW_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +HELPVIEW_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) + $(__DLLFLAG_p) -I.\..\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) HELPVIEW_OBJECTS = \ $(OBJS)\helpview_helpview.o \ $(OBJS)\helpview_helpview_rc.o diff --git a/utils/helpview/src/makefile.vc b/utils/helpview/src/makefile.vc index 0bf7e9a..817865e 100644 --- a/utils/helpview/src/makefile.vc +++ b/utils/helpview/src/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -HELPVIEW_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\helpview.pdb $(____DEBUGRUNTIME_2_p) \ +HELPVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\helpview.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) HELPVIEW_OBJECTS = \ $(OBJS)\helpview_helpview.obj \ $(OBJS)\helpview_helpview.res diff --git a/utils/helpview/src/makefile.wat b/utils/helpview/src/makefile.wat index 77206cc..d832061 100644 --- a/utils/helpview/src/makefile.wat +++ b/utils/helpview/src/makefile.wat @@ -176,10 +176,11 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -HELPVIEW_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +HELPVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + $(__DLLFLAG_p) -i=.\..\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) & + $(CXXFLAGS) HELPVIEW_OBJECTS = & $(OBJS)\helpview_helpview.obj OBJS = & diff --git a/utils/hhp2cached/Makefile.in b/utils/hhp2cached/Makefile.in index 25e7db0..13de212 100644 --- a/utils/hhp2cached/Makefile.in +++ b/utils/hhp2cached/Makefile.in @@ -38,9 +38,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### DESTDIR = -HHP2CACHED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +HHP2CACHED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) HHP2CACHED_OBJECTS = \ $(__hhp2cached_os2_lib_res) \ hhp2cached_hhp2cached.o \ @@ -79,8 +78,8 @@ LIBDIRNAME = $(top_builddir)lib @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o hhp2cached$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o hhp2cached$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -129,7 +128,7 @@ hhp2cached_hhp2cached.o: $(srcdir)/hhp2cached.cpp $(CXXC) -c -o $@ $(HHP2CACHED_CXXFLAGS) $< hhp2cached_hhp2cached_rc.o: $(srcdir)/hhp2cached.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all install_hhp2cached diff --git a/utils/hhp2cached/makefile.bcc b/utils/hhp2cached/makefile.bcc index c4c87d3..7bd305b 100644 --- a/utils/hhp2cached/makefile.bcc +++ b/utils/hhp2cached/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### -HHP2CACHED_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +HHP2CACHED_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) + -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) HHP2CACHED_OBJECTS = \ $(OBJS)\hhp2cached_hhp2cached.obj OBJS = \ @@ -174,6 +175,6 @@ clean: -if exist $(OBJS)\hhp2cached.ils del $(OBJS)\hhp2cached.ils $(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(HHP2CACHED_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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\hhp2cached_hhp2cached.res | diff --git a/utils/hhp2cached/makefile.gcc b/utils/hhp2cached/makefile.gcc index 168c153..f451397 100644 --- a/utils/hhp2cached/makefile.gcc +++ b/utils/hhp2cached/makefile.gcc @@ -12,11 +12,11 @@ include ../../build/msw/config.gcc ### Variables: ### -HHP2CACHED_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ - -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \ - $(__EXCEPTIONSFLAG_5) +HHP2CACHED_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ + $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) HHP2CACHED_OBJECTS = \ $(OBJS)\hhp2cached_hhp2cached.o \ $(OBJS)\hhp2cached_hhp2cached_rc.o diff --git a/utils/hhp2cached/makefile.vc b/utils/hhp2cached/makefile.vc index 8840aea..dfeb48f 100644 --- a/utils/hhp2cached/makefile.vc +++ b/utils/hhp2cached/makefile.vc @@ -12,12 +12,12 @@ ### Variables: ### -HHP2CACHED_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ - /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\hhp2cached.pdb $(____DEBUGRUNTIME_2_p) \ +HHP2CACHED_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\hhp2cached.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \ - /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) HHP2CACHED_OBJECTS = \ $(OBJS)\hhp2cached_hhp2cached.obj \ $(OBJS)\hhp2cached_hhp2cached.res diff --git a/utils/hhp2cached/makefile.wat b/utils/hhp2cached/makefile.wat index eacc46a..2463b90 100644 --- a/utils/hhp2cached/makefile.wat +++ b/utils/hhp2cached/makefile.wat @@ -172,10 +172,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### -HHP2CACHED_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +HHP2CACHED_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) + -i=.\..\..\samples $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) HHP2CACHED_OBJECTS = & $(OBJS)\hhp2cached_hhp2cached.obj OBJS = & diff --git a/utils/makefile.bcc b/utils/makefile.bcc index 8bd811d..a72992e 100644 --- a/utils/makefile.bcc +++ b/utils/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,10 +19,6 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### MAKEARGS = -DCPPFLAGS="$(CPPFLAGS)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \ diff --git a/utils/tex2rtf/src/Makefile.in b/utils/tex2rtf/src/Makefile.in index cd0f8cf..d69397a 100644 --- a/utils/tex2rtf/src/Makefile.in +++ b/utils/tex2rtf/src/Makefile.in @@ -39,12 +39,10 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -TEX2RTF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) -DNO_GUI $(CPPFLAGS) \ - $(CXXFLAGS) -TEX2RTF_GUI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) +TEX2RTF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -DNO_GUI $(CPPFLAGS) $(CXXFLAGS) +TEX2RTF_GUI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) TEX2RTF_GUI_OBJECTS = \ $(__tex2rtf_gui___win32rc) \ $(__tex2rtf_gui_os2_lib_res) \ @@ -98,9 +96,9 @@ TEX2RTF_OBJECTS = \ @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_4) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_4) -i $(srcdir)/../../../samples -o tex2rtf_gui$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_4) -i $(srcdir) $(__DLLFLAG_p_4) -i \ + $(srcdir)/../../../samples -o tex2rtf_gui$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -179,7 +177,7 @@ tex2rtf_gui_rtfutils.o: $(srcdir)/rtfutils.cpp $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $< tex2rtf_gui_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_5) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_5) --include-dir $(srcdir)/../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_5) --include-dir $(srcdir) $(__DLLFLAG_p_5) --include-dir $(srcdir)/../../../samples tex2rtf_gui_table.o: $(srcdir)/table.cpp $(CXXC) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $< diff --git a/utils/tex2rtf/src/makefile.bcc b/utils/tex2rtf/src/makefile.bcc index 16864bd..a3b7cc5 100644 --- a/utils/tex2rtf/src/makefile.bcc +++ b/utils/tex2rtf/src/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,24 +19,20 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEX2RTF_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_0) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -DNO_GUI $(CXXFLAGS) -TEX2RTF_GUI_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_0) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) +TEX2RTF_CXXFLAGS = $(__RUNTIME_LIBS_0) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \ + -DNO_GUI $(CPPFLAGS) $(CXXFLAGS) +TEX2RTF_GUI_CXXFLAGS = $(__RUNTIME_LIBS_0) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \ + -I.\..\..\..\samples $(CPPFLAGS) $(CXXFLAGS) TEX2RTF_GUI_OBJECTS = \ $(OBJS)\tex2rtf_gui_tex2rtf.obj \ $(OBJS)\tex2rtf_gui_tex2any.obj \ @@ -248,13 +249,13 @@ clean: -if exist $(OBJS)\tex2rtf_gui.ils del $(OBJS)\tex2rtf_gui.ils $(OBJS)\tex2rtf.exe: $(TEX2RTF_OBJECTS) - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&| c0x32.obj $(TEX2RTF_OBJECTS),$@,, $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS).lib,, | !if "$(USE_GUI)" == "1" $(OBJS)\tex2rtf_gui.exe: $(TEX2RTF_GUI_OBJECTS) $(OBJS)\tex2rtf_gui_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| c0w32.obj $(TEX2RTF_GUI_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$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS).lib,, $(OBJS)\tex2rtf_gui_sample.res | !endif diff --git a/utils/tex2rtf/src/makefile.gcc b/utils/tex2rtf/src/makefile.gcc index 18983e8..c17e836 100644 --- a/utils/tex2rtf/src/makefile.gcc +++ b/utils/tex2rtf/src/makefile.gcc @@ -16,16 +16,15 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEX2RTF_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ +TEX2RTF_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -DNO_GUI \ + $(__EXCEPTIONSFLAG_0) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) +TEX2RTF_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -DNO_GUI $(CXXFLAGS) $(__EXCEPTIONSFLAG_0) \ - $(__EXCEPTIONSFLAG) -TEX2RTF_GUI_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_0) \ - $(__EXCEPTIONSFLAG) + $(__DLLFLAG_p) -I.\..\..\..\samples $(__EXCEPTIONSFLAG_0) \ + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) TEX2RTF_GUI_OBJECTS = \ $(OBJS)\tex2rtf_gui_sample_rc.o \ $(OBJS)\tex2rtf_gui_tex2rtf.o \ diff --git a/utils/tex2rtf/src/makefile.vc b/utils/tex2rtf/src/makefile.vc index 432620c..c507886 100644 --- a/utils/tex2rtf/src/makefile.vc +++ b/utils/tex2rtf/src/makefile.vc @@ -16,18 +16,18 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEX2RTF_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ +TEX2RTF_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO) /Fd$(OBJS)\tex2rtf.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ - /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE /DNO_GUI $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_0) $(__EXCEPTIONSFLAG) -TEX2RTF_GUI_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_16) \ - /DWIN32 $(__DEBUGINFO) /Fd$(OBJS)\tex2rtf_gui.pdb $(____DEBUGRUNTIME_15_p) \ + /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE /DNO_GUI \ + $(__EXCEPTIONSFLAG_0) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) +TEX2RTF_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_16) /DWIN32 \ + $(__DEBUGINFO) /Fd$(OBJS)\tex2rtf_gui.pdb $(____DEBUGRUNTIME_15_p) \ $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples \ - $(CXXFLAGS) $(__EXCEPTIONSFLAG_0) $(__EXCEPTIONSFLAG) + $(__EXCEPTIONSFLAG_0) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) TEX2RTF_GUI_OBJECTS = \ $(OBJS)\tex2rtf_gui_sample.res \ $(OBJS)\tex2rtf_gui_tex2rtf.obj \ diff --git a/utils/tex2rtf/src/makefile.wat b/utils/tex2rtf/src/makefile.wat index 31e1c81..972edcf 100644 --- a/utils/tex2rtf/src/makefile.wat +++ b/utils/tex2rtf/src/makefile.wat @@ -180,14 +180,14 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEX2RTF_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -dNO_GUI $(CXXFLAGS) $(__EXCEPTIONSFLAG) -TEX2RTF_GUI_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG) +TEX2RTF_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -dNO_GUI & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) +TEX2RTF_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) TEX2RTF_GUI_OBJECTS = & $(OBJS)\tex2rtf_gui_tex2rtf.obj & $(OBJS)\tex2rtf_gui_tex2any.obj & diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in index 59d32bf..7455957 100644 --- a/utils/wxrc/Makefile.in +++ b/utils/wxrc/Makefile.in @@ -35,8 +35,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WXRC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS) +WXRC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS) WXRC_OBJECTS = \ wxrc_wxrc.o diff --git a/utils/wxrc/makefile.bcc b/utils/wxrc/makefile.bcc index 12e286b..5fcb532 100644 --- a/utils/wxrc/makefile.bcc +++ b/utils/wxrc/makefile.bcc @@ -4,7 +4,12 @@ # Do not modify, all changes will be overwritten! # ========================================================================= +.autodepend + !ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif BCCDIR = $(MAKEDIR)\.. !endif @@ -14,20 +19,16 @@ BCCDIR = $(MAKEDIR)\.. # Do not modify the rest of this file! # ------------------------------------------------------------------------- -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif - ### Variables: ### OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXRC_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +WXRC_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) $(CXXFLAGS) + -I$(SETUPHDIR) -I. $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS) WXRC_OBJECTS = \ $(OBJS)\wxrc_wxrc.obj @@ -151,6 +152,6 @@ clean: -if exist $(OBJS)\wxrc.ils del $(OBJS)\wxrc.ils $(OBJS)\wxrc.exe: $(WXRC_OBJECTS) - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&| + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&| c0x32.obj $(WXRC_OBJECTS),$@,, $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, | diff --git a/utils/wxrc/makefile.gcc b/utils/wxrc/makefile.gcc index c7ba420..57d676a 100644 --- a/utils/wxrc/makefile.gcc +++ b/utils/wxrc/makefile.gcc @@ -16,10 +16,10 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXRC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ - $(__DLLFLAG_p) $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) +WXRC_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ + -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) \ + $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) WXRC_OBJECTS = \ $(OBJS)\wxrc_wxrc.o diff --git a/utils/wxrc/makefile.vc b/utils/wxrc/makefile.vc index ed0ec76..d39d49e 100644 --- a/utils/wxrc/makefile.vc +++ b/utils/wxrc/makefile.vc @@ -16,12 +16,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXRC_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ +WXRC_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ $(__DEBUGINFO_0) /Fd$(OBJS)\wxrc.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include \ - /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE $(CXXFLAGS) \ - $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) + /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE $(__EXCEPTIONSFLAG_8) \ + $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS) WXRC_OBJECTS = \ $(OBJS)\wxrc_wxrc.obj diff --git a/utils/wxrc/makefile.wat b/utils/wxrc/makefile.wat index f5220ae..530748d 100644 --- a/utils/wxrc/makefile.wat +++ b/utils/wxrc/makefile.wat @@ -170,10 +170,10 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXRC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) $(CXXFLAGS) $(__EXCEPTIONSFLAG_7) +WXRC_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) WXRC_OBJECTS = & $(OBJS)\wxrc_wxrc.obj -- 2.7.4