From 509f339a81d66c65fe2af1a67d63d6c856046ec2 Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Thu, 4 Sep 2008 07:57:32 +0000 Subject: [PATCH] rebake git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 1674 +++++++++++++-------------- build/msw/makefile.bcc | 2 +- build/msw/makefile.gcc | 2 +- build/msw/makefile.vc | 2 +- build/msw/makefile.wat | 2 +- build/msw/wx_core.dsp | 4 + build/msw/wx_vc7_core.vcproj | 2 + build/msw/wx_vc8_core.vcproj | 3 + configure | 15 +- demos/Makefile.in | 2 +- demos/bombs/Makefile.in | 32 +- demos/bombs/makefile.bcc | 2 +- demos/bombs/makefile.gcc | 4 +- demos/bombs/makefile.vc | 2 +- demos/bombs/makefile.wat | 2 +- demos/forty/Makefile.in | 32 +- demos/forty/makefile.bcc | 2 +- demos/forty/makefile.gcc | 4 +- demos/forty/makefile.vc | 2 +- demos/forty/makefile.wat | 2 +- demos/fractal/Makefile.in | 32 +- demos/fractal/makefile.bcc | 2 +- demos/fractal/makefile.gcc | 4 +- demos/fractal/makefile.vc | 2 +- demos/fractal/makefile.wat | 2 +- demos/life/Makefile.in | 32 +- demos/life/makefile.bcc | 2 +- demos/life/makefile.gcc | 4 +- demos/life/makefile.vc | 2 +- demos/life/makefile.wat | 2 +- demos/poem/Makefile.in | 32 +- demos/poem/makefile.bcc | 2 +- demos/poem/makefile.gcc | 4 +- demos/poem/makefile.vc | 2 +- demos/poem/makefile.wat | 2 +- samples/access/Makefile.in | 32 +- samples/access/makefile.bcc | 2 +- samples/access/makefile.gcc | 4 +- samples/access/makefile.unx | 4 +- samples/access/makefile.vc | 2 +- samples/access/makefile.wat | 2 +- samples/animate/Makefile.in | 32 +- samples/animate/makefile.bcc | 2 +- samples/animate/makefile.gcc | 4 +- samples/animate/makefile.unx | 4 +- samples/animate/makefile.vc | 2 +- samples/animate/makefile.wat | 2 +- samples/artprov/Makefile.in | 32 +- samples/artprov/makefile.bcc | 2 +- samples/artprov/makefile.gcc | 4 +- samples/artprov/makefile.unx | 4 +- samples/artprov/makefile.vc | 2 +- samples/artprov/makefile.wat | 2 +- samples/aui/Makefile.in | 32 +- samples/aui/makefile.bcc | 2 +- samples/aui/makefile.gcc | 4 +- samples/aui/makefile.unx | 4 +- samples/aui/makefile.vc | 2 +- samples/aui/makefile.wat | 2 +- samples/calendar/Makefile.in | 4 +- samples/calendar/makefile.bcc | 2 +- samples/calendar/makefile.gcc | 4 +- samples/calendar/makefile.unx | 4 +- samples/calendar/makefile.vc | 2 +- samples/calendar/makefile.wat | 2 +- samples/caret/Makefile.in | 32 +- samples/caret/makefile.bcc | 2 +- samples/caret/makefile.gcc | 4 +- samples/caret/makefile.unx | 4 +- samples/caret/makefile.vc | 2 +- samples/caret/makefile.wat | 2 +- samples/collpane/Makefile.in | 32 +- samples/collpane/makefile.bcc | 2 +- samples/collpane/makefile.gcc | 4 +- samples/collpane/makefile.unx | 4 +- samples/collpane/makefile.vc | 2 +- samples/collpane/makefile.wat | 2 +- samples/combo/Makefile.in | 32 +- samples/combo/makefile.bcc | 2 +- samples/combo/makefile.gcc | 4 +- samples/combo/makefile.unx | 4 +- samples/combo/makefile.vc | 2 +- samples/combo/makefile.wat | 2 +- samples/config/Makefile.in | 32 +- samples/config/makefile.bcc | 2 +- samples/config/makefile.gcc | 4 +- samples/config/makefile.unx | 4 +- samples/config/makefile.vc | 2 +- samples/config/makefile.wat | 2 +- samples/console/Makefile.in | 13 +- samples/console/makefile.bcc | 2 +- samples/console/makefile.gcc | 4 +- samples/console/makefile.unx | 4 +- samples/console/makefile.vc | 2 +- samples/console/makefile.wat | 2 +- samples/controls/Makefile.in | 32 +- samples/controls/makefile.bcc | 2 +- samples/controls/makefile.gcc | 4 +- samples/controls/makefile.unx | 4 +- samples/controls/makefile.vc | 2 +- samples/controls/makefile.wat | 2 +- samples/dataview/Makefile.in | 32 +- samples/dataview/makefile.bcc | 2 +- samples/dataview/makefile.gcc | 4 +- samples/dataview/makefile.unx | 4 +- samples/dataview/makefile.vc | 2 +- samples/dataview/makefile.wat | 2 +- samples/debugrpt/Makefile.in | 32 +- samples/debugrpt/makefile.bcc | 2 +- samples/debugrpt/makefile.gcc | 4 +- samples/debugrpt/makefile.unx | 4 +- samples/debugrpt/makefile.vc | 2 +- samples/debugrpt/makefile.wat | 2 +- samples/dialogs/Makefile.in | 4 +- samples/dialogs/makefile.bcc | 2 +- samples/dialogs/makefile.gcc | 4 +- samples/dialogs/makefile.unx | 4 +- samples/dialogs/makefile.vc | 2 +- samples/dialogs/makefile.wat | 2 +- samples/dialup/Makefile.in | 32 +- samples/dialup/makefile.bcc | 2 +- samples/dialup/makefile.gcc | 4 +- samples/dialup/makefile.unx | 4 +- samples/dialup/makefile.vc | 2 +- samples/dialup/makefile.wat | 2 +- samples/display/Makefile.in | 32 +- samples/display/makefile.bcc | 2 +- samples/display/makefile.gcc | 4 +- samples/display/makefile.unx | 4 +- samples/display/makefile.vc | 2 +- samples/display/makefile.wat | 2 +- samples/dnd/Makefile.in | 33 +- samples/dnd/makefile.bcc | 2 +- samples/dnd/makefile.gcc | 4 +- samples/dnd/makefile.unx | 4 +- samples/dnd/makefile.vc | 2 +- samples/dnd/makefile.wat | 2 +- samples/docview/Makefile.in | 27 +- samples/docview/makefile.bcc | 2 +- samples/docview/makefile.gcc | 4 +- samples/docview/makefile.unx | 4 +- samples/docview/makefile.vc | 2 +- samples/docview/makefile.wat | 2 +- samples/docvwmdi/Makefile.in | 32 +- samples/docvwmdi/makefile.bcc | 2 +- samples/docvwmdi/makefile.gcc | 4 +- samples/docvwmdi/makefile.unx | 4 +- samples/docvwmdi/makefile.vc | 2 +- samples/docvwmdi/makefile.wat | 2 +- samples/dragimag/Makefile.in | 32 +- samples/dragimag/makefile.bcc | 2 +- samples/dragimag/makefile.gcc | 4 +- samples/dragimag/makefile.unx | 4 +- samples/dragimag/makefile.vc | 2 +- samples/dragimag/makefile.wat | 2 +- samples/drawing/Makefile.in | 32 +- samples/drawing/makefile.bcc | 2 +- samples/drawing/makefile.gcc | 4 +- samples/drawing/makefile.unx | 4 +- samples/drawing/makefile.vc | 2 +- samples/drawing/makefile.wat | 2 +- samples/editlbox/Makefile.in | 32 +- samples/editlbox/makefile.bcc | 2 +- samples/editlbox/makefile.gcc | 4 +- samples/editlbox/makefile.unx | 4 +- samples/editlbox/makefile.vc | 2 +- samples/editlbox/makefile.wat | 2 +- samples/erase/Makefile.in | 32 +- samples/erase/makefile.bcc | 2 +- samples/erase/makefile.gcc | 4 +- samples/erase/makefile.unx | 4 +- samples/erase/makefile.vc | 2 +- samples/erase/makefile.wat | 2 +- samples/event/Makefile.in | 32 +- samples/event/makefile.bcc | 2 +- samples/event/makefile.gcc | 4 +- samples/event/makefile.unx | 4 +- samples/event/makefile.vc | 2 +- samples/event/makefile.wat | 2 +- samples/except/Makefile.in | 32 +- samples/except/makefile.bcc | 2 +- samples/except/makefile.gcc | 4 +- samples/except/makefile.unx | 4 +- samples/except/makefile.vc | 2 +- samples/except/makefile.wat | 2 +- samples/exec/Makefile.in | 23 +- samples/exec/makefile.bcc | 2 +- samples/exec/makefile.gcc | 4 +- samples/exec/makefile.unx | 4 +- samples/exec/makefile.vc | 2 +- samples/exec/makefile.wat | 2 +- samples/font/Makefile.in | 32 +- samples/font/font.cpp | 2 +- samples/font/makefile.bcc | 2 +- samples/font/makefile.gcc | 4 +- samples/font/makefile.unx | 4 +- samples/font/makefile.vc | 2 +- samples/font/makefile.wat | 2 +- samples/grid/Makefile.in | 32 +- samples/grid/makefile.bcc | 2 +- samples/grid/makefile.gcc | 4 +- samples/grid/makefile.unx | 4 +- samples/grid/makefile.vc | 2 +- samples/grid/makefile.wat | 2 +- samples/help/Makefile.in | 32 +- samples/help/makefile.bcc | 2 +- samples/help/makefile.gcc | 4 +- samples/help/makefile.unx | 4 +- samples/help/makefile.vc | 2 +- samples/help/makefile.wat | 2 +- samples/htlbox/Makefile.in | 32 +- samples/htlbox/makefile.bcc | 2 +- samples/htlbox/makefile.gcc | 4 +- samples/htlbox/makefile.unx | 4 +- samples/htlbox/makefile.vc | 2 +- samples/htlbox/makefile.wat | 2 +- samples/html/Makefile.in | 5 +- samples/html/about/Makefile.in | 32 +- samples/html/about/makefile.bcc | 2 +- samples/html/about/makefile.gcc | 4 +- samples/html/about/makefile.unx | 4 +- samples/html/about/makefile.vc | 2 +- samples/html/about/makefile.wat | 2 +- samples/html/help/Makefile.in | 32 +- samples/html/help/makefile.bcc | 2 +- samples/html/help/makefile.gcc | 4 +- samples/html/help/makefile.unx | 4 +- samples/html/help/makefile.vc | 2 +- samples/html/help/makefile.wat | 2 +- samples/html/helpview/Makefile.in | 32 +- samples/html/helpview/makefile.bcc | 2 +- samples/html/helpview/makefile.gcc | 4 +- samples/html/helpview/makefile.unx | 4 +- samples/html/helpview/makefile.vc | 2 +- samples/html/helpview/makefile.wat | 2 +- samples/html/htmlctrl/Makefile.in | 32 +- samples/html/htmlctrl/makefile.unx | 4 +- samples/html/makefile.unx | 3 +- samples/html/printing/Makefile.in | 33 +- samples/html/printing/makefile.bcc | 2 +- samples/html/printing/makefile.gcc | 4 +- samples/html/printing/makefile.unx | 4 +- samples/html/printing/makefile.vc | 2 +- samples/html/printing/makefile.wat | 2 +- samples/html/test/Makefile.in | 32 +- samples/html/test/makefile.bcc | 2 +- samples/html/test/makefile.gcc | 4 +- samples/html/test/makefile.unx | 4 +- samples/html/test/makefile.vc | 2 +- samples/html/test/makefile.wat | 2 +- samples/html/virtual/Makefile.in | 32 +- samples/html/virtual/makefile.bcc | 2 +- samples/html/virtual/makefile.gcc | 4 +- samples/html/virtual/makefile.unx | 4 +- samples/html/virtual/makefile.vc | 2 +- samples/html/virtual/makefile.wat | 2 +- samples/html/widget/Makefile.in | 32 +- samples/html/widget/makefile.bcc | 2 +- samples/html/widget/makefile.gcc | 4 +- samples/html/widget/makefile.unx | 4 +- samples/html/widget/makefile.vc | 2 +- samples/html/widget/makefile.wat | 2 +- samples/html/zip/Makefile.in | 33 +- samples/html/zip/makefile.bcc | 2 +- samples/html/zip/makefile.gcc | 4 +- samples/html/zip/makefile.unx | 4 +- samples/html/zip/makefile.vc | 2 +- samples/html/zip/makefile.wat | 2 +- samples/image/Makefile.in | 32 +- samples/image/makefile.bcc | 2 +- samples/image/makefile.gcc | 4 +- samples/image/makefile.unx | 4 +- samples/image/makefile.vc | 2 +- samples/image/makefile.wat | 2 +- samples/internat/Makefile.in | 35 +- samples/internat/makefile.bcc | 2 +- samples/internat/makefile.gcc | 4 +- samples/internat/makefile.unx | 4 +- samples/internat/makefile.vc | 2 +- samples/internat/makefile.wat | 2 +- samples/ipc/Makefile.in | 65 +- samples/ipc/makefile.bcc | 8 +- samples/ipc/makefile.gcc | 10 +- samples/ipc/makefile.unx | 10 +- samples/ipc/makefile.vc | 8 +- samples/ipc/makefile.wat | 8 +- samples/joytest/Makefile.in | 4 +- samples/joytest/makefile.bcc | 2 +- samples/joytest/makefile.gcc | 4 +- samples/joytest/makefile.unx | 4 +- samples/joytest/makefile.vc | 2 +- samples/joytest/makefile.wat | 2 +- samples/keyboard/Makefile.in | 32 +- samples/keyboard/makefile.bcc | 2 +- samples/keyboard/makefile.gcc | 4 +- samples/keyboard/makefile.unx | 4 +- samples/keyboard/makefile.vc | 2 +- samples/keyboard/makefile.wat | 2 +- samples/layout/Makefile.in | 32 +- samples/layout/makefile.bcc | 2 +- samples/layout/makefile.gcc | 4 +- samples/layout/makefile.unx | 4 +- samples/layout/makefile.vc | 2 +- samples/layout/makefile.wat | 2 +- samples/listctrl/Makefile.in | 32 +- samples/listctrl/makefile.bcc | 2 +- samples/listctrl/makefile.gcc | 4 +- samples/listctrl/makefile.unx | 4 +- samples/listctrl/makefile.vc | 2 +- samples/listctrl/makefile.wat | 2 +- samples/makefile.gcc | 8 +- samples/mdi/Makefile.in | 33 +- samples/mdi/makefile.bcc | 2 +- samples/mdi/makefile.gcc | 4 +- samples/mdi/makefile.unx | 4 +- samples/mdi/makefile.vc | 2 +- samples/mdi/makefile.wat | 2 +- samples/mediaplayer/Makefile.in | 32 +- samples/mediaplayer/makefile.bcc | 2 +- samples/mediaplayer/makefile.gcc | 4 +- samples/mediaplayer/makefile.unx | 4 +- samples/mediaplayer/makefile.vc | 2 +- samples/mediaplayer/makefile.wat | 2 +- samples/memcheck/Makefile.in | 32 +- samples/memcheck/makefile.bcc | 2 +- samples/memcheck/makefile.gcc | 4 +- samples/memcheck/makefile.unx | 4 +- samples/memcheck/makefile.vc | 2 +- samples/memcheck/makefile.wat | 2 +- samples/menu/Makefile.in | 32 +- samples/menu/makefile.bcc | 2 +- samples/menu/makefile.gcc | 4 +- samples/menu/makefile.unx | 4 +- samples/menu/makefile.vc | 2 +- samples/menu/makefile.wat | 2 +- samples/mfc/Makefile.in | 32 +- samples/mfc/makefile.bcc | 2 +- samples/mfc/makefile.gcc | 4 +- samples/mfc/makefile.unx | 4 +- samples/mfc/makefile.vc | 2 +- samples/mfc/makefile.wat | 2 +- samples/minimal/Makefile.in | 32 +- samples/minimal/makefile.bcc | 2 +- samples/minimal/makefile.gcc | 4 +- samples/minimal/makefile.unx | 4 +- samples/minimal/makefile.vc | 2 +- samples/minimal/makefile.wat | 2 +- samples/mobile/Makefile.in | 2 +- samples/mobile/styles/Makefile.in | 38 +- samples/mobile/styles/makefile.bcc | 2 +- samples/mobile/styles/makefile.gcc | 4 +- samples/mobile/styles/makefile.unx | 4 +- samples/mobile/styles/makefile.vc | 2 +- samples/mobile/styles/makefile.wat | 2 +- samples/mobile/wxedit/Makefile.in | 38 +- samples/mobile/wxedit/makefile.bcc | 2 +- samples/mobile/wxedit/makefile.gcc | 4 +- samples/mobile/wxedit/makefile.unx | 4 +- samples/mobile/wxedit/makefile.vc | 2 +- samples/mobile/wxedit/makefile.wat | 2 +- samples/nativdlg/Makefile.in | 32 +- samples/nativdlg/makefile.bcc | 2 +- samples/nativdlg/makefile.gcc | 4 +- samples/nativdlg/makefile.unx | 4 +- samples/nativdlg/makefile.vc | 2 +- samples/nativdlg/makefile.wat | 2 +- samples/notebook/Makefile.in | 32 +- samples/notebook/makefile.bcc | 2 +- samples/notebook/makefile.gcc | 4 +- samples/notebook/makefile.unx | 4 +- samples/notebook/makefile.vc | 2 +- samples/notebook/makefile.wat | 2 +- samples/oleauto/Makefile.in | 32 +- samples/oleauto/makefile.bcc | 2 +- samples/oleauto/makefile.gcc | 4 +- samples/oleauto/makefile.unx | 4 +- samples/oleauto/makefile.vc | 2 +- samples/oleauto/makefile.wat | 2 +- samples/opengl/Makefile.in | 2 +- samples/opengl/cube/Makefile.in | 32 +- samples/opengl/cube/makefile.bcc | 2 +- samples/opengl/cube/makefile.gcc | 4 +- samples/opengl/cube/makefile.unx | 4 +- samples/opengl/cube/makefile.vc | 2 +- samples/opengl/cube/makefile.wat | 2 +- samples/opengl/isosurf/Makefile.in | 32 +- samples/opengl/isosurf/makefile.bcc | 2 +- samples/opengl/isosurf/makefile.gcc | 4 +- samples/opengl/isosurf/makefile.unx | 4 +- samples/opengl/isosurf/makefile.vc | 2 +- samples/opengl/isosurf/makefile.wat | 2 +- samples/opengl/penguin/Makefile.in | 32 +- samples/opengl/penguin/makefile.bcc | 2 +- samples/opengl/penguin/makefile.gcc | 4 +- samples/opengl/penguin/makefile.unx | 4 +- samples/opengl/penguin/makefile.vc | 2 +- samples/opengl/penguin/makefile.wat | 2 +- samples/ownerdrw/Makefile.in | 32 +- samples/ownerdrw/makefile.bcc | 2 +- samples/ownerdrw/makefile.gcc | 4 +- samples/ownerdrw/makefile.unx | 4 +- samples/ownerdrw/makefile.vc | 2 +- samples/ownerdrw/makefile.wat | 2 +- samples/popup/Makefile.in | 32 +- samples/popup/makefile.bcc | 2 +- samples/popup/makefile.gcc | 4 +- samples/popup/makefile.unx | 4 +- samples/popup/makefile.vc | 2 +- samples/popup/makefile.wat | 2 +- samples/popup/popup.cpp | 9 +- samples/power/Makefile.in | 32 +- samples/power/makefile.bcc | 2 +- samples/power/makefile.gcc | 4 +- samples/power/makefile.unx | 4 +- samples/power/makefile.vc | 2 +- samples/power/makefile.wat | 2 +- samples/printing/Makefile.in | 32 +- samples/printing/makefile.bcc | 2 +- samples/printing/makefile.gcc | 4 +- samples/printing/makefile.unx | 4 +- samples/printing/makefile.vc | 2 +- samples/printing/makefile.wat | 2 +- samples/regtest/Makefile.in | 32 +- samples/regtest/makefile.bcc | 2 +- samples/regtest/makefile.gcc | 4 +- samples/regtest/makefile.unx | 4 +- samples/regtest/makefile.vc | 2 +- samples/regtest/makefile.wat | 2 +- samples/render/Makefile.in | 37 +- samples/render/makefile.bcc | 4 +- samples/render/makefile.gcc | 6 +- samples/render/makefile.unx | 6 +- samples/render/makefile.vc | 4 +- samples/render/makefile.wat | 4 +- samples/richtext/Makefile.in | 32 +- samples/richtext/makefile.bcc | 2 +- samples/richtext/makefile.gcc | 4 +- samples/richtext/makefile.unx | 4 +- samples/richtext/makefile.vc | 2 +- samples/richtext/makefile.wat | 2 +- samples/sashtest/Makefile.in | 4 +- samples/sashtest/makefile.bcc | 2 +- samples/sashtest/makefile.gcc | 4 +- samples/sashtest/makefile.unx | 4 +- samples/sashtest/makefile.vc | 2 +- samples/sashtest/makefile.wat | 2 +- samples/scroll/Makefile.in | 32 +- samples/scroll/makefile.bcc | 2 +- samples/scroll/makefile.gcc | 4 +- samples/scroll/makefile.unx | 4 +- samples/scroll/makefile.vc | 2 +- samples/scroll/makefile.wat | 2 +- samples/scrollsub/Makefile.in | 32 +- samples/scrollsub/makefile.bcc | 2 +- samples/scrollsub/makefile.gcc | 4 +- samples/scrollsub/makefile.unx | 4 +- samples/scrollsub/makefile.vc | 2 +- samples/scrollsub/makefile.wat | 2 +- samples/shaped/Makefile.in | 32 +- samples/shaped/makefile.bcc | 2 +- samples/shaped/makefile.gcc | 4 +- samples/shaped/makefile.unx | 4 +- samples/shaped/makefile.vc | 2 +- samples/shaped/makefile.wat | 2 +- samples/sockets/Makefile.in | 65 +- samples/sockets/makefile.bcc | 8 +- samples/sockets/makefile.gcc | 10 +- samples/sockets/makefile.unx | 10 +- samples/sockets/makefile.vc | 8 +- samples/sockets/makefile.wat | 8 +- samples/sound/Makefile.in | 4 +- samples/sound/makefile.bcc | 2 +- samples/sound/makefile.gcc | 4 +- samples/sound/makefile.unx | 4 +- samples/sound/makefile.vc | 2 +- samples/sound/makefile.wat | 2 +- samples/splash/Makefile.in | 4 +- samples/splash/makefile.bcc | 2 +- samples/splash/makefile.gcc | 4 +- samples/splash/makefile.unx | 4 +- samples/splash/makefile.vc | 2 +- samples/splash/makefile.wat | 2 +- samples/splitter/Makefile.in | 32 +- samples/splitter/makefile.bcc | 2 +- samples/splitter/makefile.gcc | 4 +- samples/splitter/makefile.unx | 4 +- samples/splitter/makefile.vc | 2 +- samples/splitter/makefile.wat | 2 +- samples/statbar/Makefile.in | 32 +- samples/statbar/makefile.bcc | 2 +- samples/statbar/makefile.gcc | 4 +- samples/statbar/makefile.unx | 4 +- samples/statbar/makefile.vc | 2 +- samples/statbar/makefile.wat | 2 +- samples/stc/Makefile.in | 32 +- samples/stc/makefile.bcc | 2 +- samples/stc/makefile.gcc | 4 +- samples/stc/makefile.unx | 4 +- samples/stc/makefile.vc | 2 +- samples/stc/makefile.wat | 2 +- samples/svg/Makefile.in | 32 +- samples/svg/makefile.bcc | 2 +- samples/svg/makefile.gcc | 4 +- samples/svg/makefile.unx | 4 +- samples/svg/makefile.vc | 2 +- samples/svg/makefile.wat | 2 +- samples/taborder/Makefile.in | 32 +- samples/taborder/makefile.bcc | 2 +- samples/taborder/makefile.gcc | 4 +- samples/taborder/makefile.unx | 4 +- samples/taborder/makefile.vc | 2 +- samples/taborder/makefile.wat | 2 +- samples/taskbar/Makefile.in | 4 +- samples/taskbar/makefile.bcc | 2 +- samples/taskbar/makefile.gcc | 4 +- samples/taskbar/makefile.unx | 4 +- samples/taskbar/makefile.vc | 2 +- samples/taskbar/makefile.wat | 2 +- samples/text/Makefile.in | 32 +- samples/text/makefile.bcc | 2 +- samples/text/makefile.gcc | 4 +- samples/text/makefile.unx | 4 +- samples/text/makefile.vc | 2 +- samples/text/makefile.wat | 2 +- samples/thread/Makefile.in | 32 +- samples/thread/makefile.bcc | 2 +- samples/thread/makefile.gcc | 4 +- samples/thread/makefile.unx | 4 +- samples/thread/makefile.vc | 2 +- samples/thread/makefile.wat | 2 +- samples/toolbar/Makefile.in | 32 +- samples/toolbar/makefile.bcc | 2 +- samples/toolbar/makefile.gcc | 4 +- samples/toolbar/makefile.unx | 4 +- samples/toolbar/makefile.vc | 2 +- samples/toolbar/makefile.wat | 2 +- samples/treectrl/Makefile.in | 32 +- samples/treectrl/makefile.bcc | 2 +- samples/treectrl/makefile.gcc | 4 +- samples/treectrl/makefile.unx | 4 +- samples/treectrl/makefile.vc | 2 +- samples/treectrl/makefile.wat | 2 +- samples/typetest/Makefile.in | 32 +- samples/typetest/makefile.bcc | 2 +- samples/typetest/makefile.gcc | 4 +- samples/typetest/makefile.unx | 4 +- samples/typetest/makefile.vc | 2 +- samples/typetest/makefile.wat | 2 +- samples/validate/Makefile.in | 32 +- samples/validate/makefile.bcc | 2 +- samples/validate/makefile.gcc | 4 +- samples/validate/makefile.unx | 4 +- samples/validate/makefile.vc | 2 +- samples/validate/makefile.wat | 2 +- samples/vscroll/Makefile.in | 32 +- samples/vscroll/makefile.bcc | 2 +- samples/vscroll/makefile.gcc | 4 +- samples/vscroll/makefile.unx | 4 +- samples/vscroll/makefile.vc | 2 +- samples/vscroll/makefile.wat | 2 +- samples/widgets/Makefile.in | 4 +- samples/widgets/makefile.bcc | 2 +- samples/widgets/makefile.gcc | 4 +- samples/widgets/makefile.unx | 4 +- samples/widgets/makefile.vc | 2 +- samples/widgets/makefile.wat | 2 +- samples/wizard/Makefile.in | 4 +- samples/wizard/makefile.bcc | 2 +- samples/wizard/makefile.gcc | 4 +- samples/wizard/makefile.unx | 4 +- samples/wizard/makefile.vc | 2 +- samples/wizard/makefile.wat | 2 +- samples/wrapsizer/Makefile.in | 32 +- samples/wrapsizer/makefile.bcc | 2 +- samples/wrapsizer/makefile.gcc | 4 +- samples/wrapsizer/makefile.unx | 4 +- samples/wrapsizer/makefile.vc | 2 +- samples/wrapsizer/makefile.wat | 2 +- samples/xrc/Makefile.in | 32 +- samples/xrc/makefile.bcc | 2 +- samples/xrc/makefile.gcc | 4 +- samples/xrc/makefile.unx | 4 +- samples/xrc/makefile.vc | 2 +- samples/xrc/makefile.wat | 2 +- tests/benchmarks/Makefile.in | 4 +- tests/benchmarks/bench.dsp | 160 +-- tests/benchmarks/bench.sln | 3 +- tests/benchmarks/bench.vcproj | 645 +++++++---- tests/benchmarks/makefile.bcc | 2 +- tests/benchmarks/makefile.gcc | 4 +- tests/benchmarks/makefile.vc | 2 +- tests/benchmarks/makefile.wat | 2 +- tests/makefile.bcc | 6 +- tests/makefile.gcc | 8 +- tests/makefile.vc | 6 +- tests/makefile.wat | 6 +- utils/Makefile.in | 5 +- utils/emulator/src/Makefile.in | 32 +- utils/emulator/src/makefile.bcc | 2 +- utils/emulator/src/makefile.gcc | 4 +- utils/emulator/src/makefile.vc | 2 +- utils/emulator/src/makefile.wat | 2 +- utils/helpview/src/Makefile.in | 35 +- utils/helpview/src/makefile.bcc | 2 +- utils/helpview/src/makefile.gcc | 4 +- utils/helpview/src/makefile.vc | 2 +- utils/helpview/src/makefile.wat | 2 +- utils/hhp2cached/Makefile.in | 35 +- utils/hhp2cached/makefile.bcc | 2 +- utils/hhp2cached/makefile.gcc | 4 +- utils/hhp2cached/makefile.vc | 2 +- utils/hhp2cached/makefile.wat | 2 +- utils/ifacecheck/src/Makefile.in | 16 +- utils/ifacecheck/src/makefile.bcc | 2 +- utils/ifacecheck/src/makefile.gcc | 4 +- utils/ifacecheck/src/makefile.vc | 2 +- utils/ifacecheck/src/makefile.wat | 2 +- utils/wxrc/Makefile.in | 13 +- utils/wxrc/makefile.bcc | 2 +- utils/wxrc/makefile.gcc | 4 +- utils/wxrc/makefile.vc | 2 +- utils/wxrc/makefile.wat | 2 +- wxGTK.spec | 1 + wxMotif.spec | 1 + wxX11.spec | 1 + 625 files changed, 3351 insertions(+), 3686 deletions(-) diff --git a/Makefile.in b/Makefile.in index aa8e61c633..9ab8a2099e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -598,6 +598,7 @@ ALL_PORTS_BASE_HEADERS = \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ + wx/unix/tls.h \ wx/unix/execute.h \ wx/unix/mimetype.h \ wx/unix/private.h \ @@ -793,7 +794,6 @@ ALL_BASE_SOURCES = \ src/common/fs_mem.cpp \ src/common/msgout.cpp \ src/common/utilscmn.cpp \ - src/osx/utils_osx.cpp \ src/osx/carbon/utils.cpp \ src/osx/carbon/uma.cpp \ src/msw/evtloop.cpp \ @@ -1847,6 +1847,7 @@ COND_TOOLKIT__BASE_MACOSX_HDR = \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ + wx/unix/tls.h \ wx/unix/execute.h \ wx/unix/mimetype.h \ wx/unix/private.h \ @@ -1854,6 +1855,7 @@ COND_TOOLKIT__BASE_MACOSX_HDR = \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ wx/osx/core/hid.h \ + wx/osx/core/private.h \ wx/osx/core/stdpaths.h \ wx/osx/core/private/strconv_cf.h @COND_TOOLKIT_@BASE_MACOSX_HDR = $(COND_TOOLKIT__BASE_MACOSX_HDR) @@ -1868,6 +1870,7 @@ COND_TOOLKIT_COCOA_BASE_MACOSX_HDR = \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ + wx/unix/tls.h \ wx/unix/execute.h \ wx/unix/mimetype.h \ wx/unix/private.h \ @@ -1875,6 +1878,7 @@ COND_TOOLKIT_COCOA_BASE_MACOSX_HDR = \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ wx/osx/core/hid.h \ + wx/osx/core/private.h \ wx/osx/core/stdpaths.h \ wx/osx/core/private/strconv_cf.h @COND_TOOLKIT_COCOA@BASE_MACOSX_HDR = $(COND_TOOLKIT_COCOA_BASE_MACOSX_HDR) @@ -1889,6 +1893,7 @@ COND_TOOLKIT_GTK_BASE_MACOSX_HDR = \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ + wx/unix/tls.h \ wx/unix/execute.h \ wx/unix/mimetype.h \ wx/unix/private.h \ @@ -1896,6 +1901,7 @@ COND_TOOLKIT_GTK_BASE_MACOSX_HDR = \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ wx/osx/core/hid.h \ + wx/osx/core/private.h \ wx/osx/core/stdpaths.h \ wx/osx/core/private/strconv_cf.h @COND_TOOLKIT_GTK@BASE_MACOSX_HDR = $(COND_TOOLKIT_GTK_BASE_MACOSX_HDR) @@ -1904,6 +1910,7 @@ COND_TOOLKIT_MAC_BASE_MACOSX_HDR = \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ wx/osx/core/hid.h \ + wx/osx/core/private.h \ wx/osx/core/stdpaths.h \ wx/osx/core/private/strconv_cf.h \ wx/private/fdiodispatcher.h \ @@ -1915,7 +1922,8 @@ COND_TOOLKIT_MAC_BASE_MACOSX_HDR = \ wx/unix/evtloop.h \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ - wx/unix/stackwalk.h + wx/unix/stackwalk.h \ + wx/unix/tls.h @COND_TOOLKIT_MAC@BASE_MACOSX_HDR = $(COND_TOOLKIT_MAC_BASE_MACOSX_HDR) COND_TOOLKIT_MOTIF_BASE_MACOSX_HDR = \ wx/private/fdiodispatcher.h \ @@ -1928,6 +1936,7 @@ COND_TOOLKIT_MOTIF_BASE_MACOSX_HDR = \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ + wx/unix/tls.h \ wx/unix/execute.h \ wx/unix/mimetype.h \ wx/unix/private.h \ @@ -1935,6 +1944,7 @@ COND_TOOLKIT_MOTIF_BASE_MACOSX_HDR = \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ wx/osx/core/hid.h \ + wx/osx/core/private.h \ wx/osx/core/stdpaths.h \ wx/osx/core/private/strconv_cf.h @COND_TOOLKIT_MOTIF@BASE_MACOSX_HDR = $(COND_TOOLKIT_MOTIF_BASE_MACOSX_HDR) @@ -1949,6 +1959,7 @@ COND_TOOLKIT_X11_BASE_MACOSX_HDR = \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ + wx/unix/tls.h \ wx/unix/execute.h \ wx/unix/mimetype.h \ wx/unix/private.h \ @@ -1956,6 +1967,7 @@ COND_TOOLKIT_X11_BASE_MACOSX_HDR = \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ wx/osx/core/hid.h \ + wx/osx/core/private.h \ wx/osx/core/stdpaths.h \ wx/osx/core/private/strconv_cf.h @COND_TOOLKIT_X11@BASE_MACOSX_HDR = $(COND_TOOLKIT_X11_BASE_MACOSX_HDR) @@ -1986,6 +1998,7 @@ COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR = \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ + wx/unix/tls.h \ wx/unix/execute.h \ wx/unix/mimetype.h \ wx/unix/private.h \ @@ -3260,6 +3273,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/textctrl.h \ wx/textdlg.h \ wx/textentry.h \ + wx/tls.h \ wx/toolbar.h \ wx/validate.h \ wx/valtext.h \ @@ -3706,7 +3720,7 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS = \ @COND_PLATFORM_WIN32_1@ = monodll_evtloop.o monodll_main.o monodll_mslu.o \ @COND_PLATFORM_WIN32_1@ monodll_volume.o @COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS = \ -@COND_TOOLKIT_MAC@ monodll_utils_osx.o monodll_utils.o monodll_uma.o +@COND_TOOLKIT_MAC@ monodll_utils.o monodll_uma.o @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o @COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o @@ -4693,50 +4707,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS = \ monodll_toolbar.o \ monodll_tooltip.o \ monodll_window.o \ - monodll_bitmap.o \ - monodll_colour.o \ - monodll_dcmemory.o \ - monodll_display.o \ - monodll_fontenum.o \ - monodll_printmac.o \ - monodll_timer.o \ - monodll_accel.o \ - monodll_artmac.o \ - monodll_brush.o \ - monodll_fontutil.o \ - monodll_imaglist.o \ - monodll_minifram.o \ - monodll_palette.o \ - monodll_pen.o \ - monodll_checklst.o \ - monodll_radiobox.o \ - monodll_spinctrl.o \ - monodll_toplevel.o \ - monodll_window_osx.o \ - monodll_bmpbuttn_osx.o \ - monodll_button_osx.o \ - monodll_checkbox_osx.o \ - monodll_choice_osx.o \ - monodll_dialog_osx.o \ - monodll_gauge_osx.o \ - monodll_glcanvas_osx.o \ - monodll_listbox_osx.o \ - monodll_menu_osx.o \ - monodll_menuitem_osx.o \ - monodll_nonownedwnd_osx.o \ - monodll_notebook_osx.o \ - monodll_radiobut_osx.o \ - monodll_scrolbar_osx.o \ - monodll_slider_osx.o \ - monodll_spinbutt_osx.o \ - monodll_srchctrl_osx.o \ - monodll_statbox_osx.o \ - monodll_statline_osx.o \ - monodll_stattext_osx.o \ - monodll_tabctrl_osx.o \ - monodll_textctrl_osx.o \ - monodll_tglbtn_osx.o \ - monodll_toolbar_osx.o \ monodll_caret.o \ monodll_clrpickerg.o \ monodll_collpaneg.o \ @@ -5632,7 +5602,7 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_1 = \ @COND_PLATFORM_WIN32_1@ = monolib_evtloop.o monolib_main.o monolib_mslu.o \ @COND_PLATFORM_WIN32_1@ monolib_volume.o @COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1 = \ -@COND_TOOLKIT_MAC@ monolib_utils_osx.o monolib_utils.o monolib_uma.o +@COND_TOOLKIT_MAC@ monolib_utils.o monolib_uma.o @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o @COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o @@ -6620,50 +6590,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 = \ monolib_toolbar.o \ monolib_tooltip.o \ monolib_window.o \ - monolib_bitmap.o \ - monolib_colour.o \ - monolib_dcmemory.o \ - monolib_display.o \ - monolib_fontenum.o \ - monolib_printmac.o \ - monolib_timer.o \ - monolib_accel.o \ - monolib_artmac.o \ - monolib_brush.o \ - monolib_fontutil.o \ - monolib_imaglist.o \ - monolib_minifram.o \ - monolib_palette.o \ - monolib_pen.o \ - monolib_checklst.o \ - monolib_radiobox.o \ - monolib_spinctrl.o \ - monolib_toplevel.o \ - monolib_window_osx.o \ - monolib_bmpbuttn_osx.o \ - monolib_button_osx.o \ - monolib_checkbox_osx.o \ - monolib_choice_osx.o \ - monolib_dialog_osx.o \ - monolib_gauge_osx.o \ - monolib_glcanvas_osx.o \ - monolib_listbox_osx.o \ - monolib_menu_osx.o \ - monolib_menuitem_osx.o \ - monolib_nonownedwnd_osx.o \ - monolib_notebook_osx.o \ - monolib_radiobut_osx.o \ - monolib_scrolbar_osx.o \ - monolib_slider_osx.o \ - monolib_spinbutt_osx.o \ - monolib_srchctrl_osx.o \ - monolib_statbox_osx.o \ - monolib_statline_osx.o \ - monolib_stattext_osx.o \ - monolib_tabctrl_osx.o \ - monolib_textctrl_osx.o \ - monolib_tglbtn_osx.o \ - monolib_toolbar_osx.o \ monolib_caret.o \ monolib_clrpickerg.o \ monolib_collpaneg.o \ @@ -7595,7 +7521,7 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_2 = \ @COND_PLATFORM_WIN32_1@ = basedll_evtloop.o basedll_main.o basedll_mslu.o \ @COND_PLATFORM_WIN32_1@ basedll_volume.o @COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2 = \ -@COND_TOOLKIT_MAC@ basedll_utils_osx.o basedll_utils.o basedll_uma.o +@COND_TOOLKIT_MAC@ basedll_utils.o basedll_uma.o COND_MONOLITHIC_0_SHARED_0___baselib___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) @COND_MONOLITHIC_0_SHARED_0@__baselib___depname = $(COND_MONOLITHIC_0_SHARED_0___baselib___depname) @@ -7795,7 +7721,7 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3 = \ @COND_PLATFORM_WIN32_1@ = baselib_evtloop.o baselib_main.o baselib_mslu.o \ @COND_PLATFORM_WIN32_1@ baselib_volume.o @COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 = \ -@COND_TOOLKIT_MAC@ baselib_utils_osx.o baselib_utils.o baselib_uma.o +@COND_TOOLKIT_MAC@ baselib_utils.o baselib_uma.o @COND_SHARED_1@____wxbase_namedll_DEP = $(__basedll___depname) @COND_SHARED_0@____wxbase_namelib_DEP = $(__baselib___depname) COND_MONOLITHIC_0_SHARED_1___netdll___depname = \ @@ -7937,7 +7863,7 @@ COND_USE_SOSYMLINKS_1___coredll___so_symlinks_uninst_cmd = rm -f \ @COND_PLATFORM_WIN32_1@ = coredll_evtloop.o coredll_main.o coredll_mslu.o \ @COND_PLATFORM_WIN32_1@ coredll_volume.o @COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4 = \ -@COND_TOOLKIT_MAC@ coredll_utils_osx.o coredll_utils.o coredll_uma.o +@COND_TOOLKIT_MAC@ coredll_utils.o coredll_uma.o COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ $(__LOWLEVEL_SRC_OBJECTS_4) \ $(__PLATFORM_SRC_OBJECTS_8) \ @@ -8807,50 +8733,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 = \ coredll_toolbar.o \ coredll_tooltip.o \ coredll_window.o \ - coredll_bitmap.o \ - coredll_colour.o \ - coredll_dcmemory.o \ - coredll_display.o \ - coredll_fontenum.o \ - coredll_printmac.o \ - coredll_timer.o \ - coredll_accel.o \ - coredll_artmac.o \ - coredll_brush.o \ - coredll_fontutil.o \ - coredll_imaglist.o \ - coredll_minifram.o \ - coredll_palette.o \ - coredll_pen.o \ - coredll_checklst.o \ - coredll_radiobox.o \ - coredll_spinctrl.o \ - coredll_toplevel.o \ - coredll_window_osx.o \ - coredll_bmpbuttn_osx.o \ - coredll_button_osx.o \ - coredll_checkbox_osx.o \ - coredll_choice_osx.o \ - coredll_dialog_osx.o \ - coredll_gauge_osx.o \ - coredll_glcanvas_osx.o \ - coredll_listbox_osx.o \ - coredll_menu_osx.o \ - coredll_menuitem_osx.o \ - coredll_nonownedwnd_osx.o \ - coredll_notebook_osx.o \ - coredll_radiobut_osx.o \ - coredll_scrolbar_osx.o \ - coredll_slider_osx.o \ - coredll_spinbutt_osx.o \ - coredll_srchctrl_osx.o \ - coredll_statbox_osx.o \ - coredll_statline_osx.o \ - coredll_stattext_osx.o \ - coredll_tabctrl_osx.o \ - coredll_textctrl_osx.o \ - coredll_tglbtn_osx.o \ - coredll_toolbar_osx.o \ coredll_caret.o \ coredll_clrpickerg.o \ coredll_collpaneg.o \ @@ -9461,7 +9343,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname = \ @COND_PLATFORM_WIN32_1@ = corelib_evtloop.o corelib_main.o corelib_mslu.o \ @COND_PLATFORM_WIN32_1@ corelib_volume.o @COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5 = \ -@COND_TOOLKIT_MAC@ corelib_utils_osx.o corelib_utils.o corelib_uma.o +@COND_TOOLKIT_MAC@ corelib_utils.o corelib_uma.o COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ $(__LOWLEVEL_SRC_OBJECTS_6) \ $(__PLATFORM_SRC_OBJECTS_9) \ @@ -10331,50 +10213,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 = \ corelib_toolbar.o \ corelib_tooltip.o \ corelib_window.o \ - corelib_bitmap.o \ - corelib_colour.o \ - corelib_dcmemory.o \ - corelib_display.o \ - corelib_fontenum.o \ - corelib_printmac.o \ - corelib_timer.o \ - corelib_accel.o \ - corelib_artmac.o \ - corelib_brush.o \ - corelib_fontutil.o \ - corelib_imaglist.o \ - corelib_minifram.o \ - corelib_palette.o \ - corelib_pen.o \ - corelib_checklst.o \ - corelib_radiobox.o \ - corelib_spinctrl.o \ - corelib_toplevel.o \ - corelib_window_osx.o \ - corelib_bmpbuttn_osx.o \ - corelib_button_osx.o \ - corelib_checkbox_osx.o \ - corelib_choice_osx.o \ - corelib_dialog_osx.o \ - corelib_gauge_osx.o \ - corelib_glcanvas_osx.o \ - corelib_listbox_osx.o \ - corelib_menu_osx.o \ - corelib_menuitem_osx.o \ - corelib_nonownedwnd_osx.o \ - corelib_notebook_osx.o \ - corelib_radiobut_osx.o \ - corelib_scrolbar_osx.o \ - corelib_slider_osx.o \ - corelib_spinbutt_osx.o \ - corelib_srchctrl_osx.o \ - corelib_statbox_osx.o \ - corelib_statline_osx.o \ - corelib_stattext_osx.o \ - corelib_tabctrl_osx.o \ - corelib_textctrl_osx.o \ - corelib_tglbtn_osx.o \ - corelib_toolbar_osx.o \ corelib_caret.o \ corelib_clrpickerg.o \ corelib_collpaneg.o \ @@ -11804,7 +11642,8 @@ COND_USE_SOSYMLINKS_1___gldll___so_symlinks_uninst_cmd = rm -f \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ = gldll_glcanvas.o gldll_glx11.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__OPENGL_SRC_PLATFORM_OBJECTS \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = gldll_glcanvas.o gldll_glx11.o -@COND_TOOLKIT_MAC@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_glcanvas.o +@COND_TOOLKIT_MAC@__OPENGL_SRC_PLATFORM_OBJECTS = \ +@COND_TOOLKIT_MAC@ gldll_glcanvas.o gldll_glcanvas_osx.o @COND_TOOLKIT_MOTIF@__OPENGL_SRC_PLATFORM_OBJECTS = \ @COND_TOOLKIT_MOTIF@ gldll_glcanvas.o gldll_glx11.o @COND_TOOLKIT_MSW@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_glcanvas.o @@ -11838,7 +11677,8 @@ COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname = \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ = gllib_glcanvas.o gllib_glx11.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__OPENGL_SRC_PLATFORM_OBJECTS_1 \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = gllib_glcanvas.o gllib_glx11.o -@COND_TOOLKIT_MAC@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_glcanvas.o +@COND_TOOLKIT_MAC@__OPENGL_SRC_PLATFORM_OBJECTS_1 = \ +@COND_TOOLKIT_MAC@ gllib_glcanvas.o gllib_glcanvas_osx.o @COND_TOOLKIT_MOTIF@__OPENGL_SRC_PLATFORM_OBJECTS_1 = \ @COND_TOOLKIT_MOTIF@ gllib_glcanvas.o gllib_glx11.o @COND_TOOLKIT_MSW@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_glcanvas.o @@ -11862,8 +11702,53 @@ COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \ @COND_TOOLKIT_COCOA@__cocoa_res_install___depname = cocoa-res-install @COND_SHARED_0@____SHARED = @COND_SHARED_1@____SHARED = $(PIC_FLAG) -@COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS \ -@COND_PLATFORM_MACOSX_1@ = monodll_hid.o monodll_utilsexc_cf.o +COND_PLATFORM_MACOSX_1___MAC_LOWLEVEL_SRC_OBJECTS = \ + monodll_accel.o \ + monodll_artmac.o \ + monodll_bmpbuttn_osx.o \ + monodll_brush.o \ + monodll_button_osx.o \ + monodll_checkbox_osx.o \ + monodll_checklst_osx.o \ + monodll_choice_osx.o \ + monodll_dialog_osx.o \ + monodll_fontutil.o \ + monodll_gauge_osx.o \ + monodll_imaglist.o \ + monodll_listbox_osx.o \ + monodll_menu_osx.o \ + monodll_menuitem_osx.o \ + monodll_minifram.o \ + monodll_nonownedwnd_osx.o \ + monodll_notebook_osx.o \ + monodll_palette.o \ + monodll_pen.o \ + monodll_radiobox_osx.o \ + monodll_radiobut_osx.o \ + monodll_scrolbar_osx.o \ + monodll_slider_osx.o \ + monodll_spinbutt_osx.o \ + monodll_spinctrl_osx.o \ + monodll_statbox_osx.o \ + monodll_statline_osx.o \ + monodll_stattext_osx.o \ + monodll_tabctrl_osx.o \ + monodll_textctrl_osx.o \ + monodll_tglbtn_osx.o \ + monodll_toolbar_osx.o \ + monodll_toplevel_osx.o \ + monodll_utils_osx.o \ + monodll_window_osx.o \ + monodll_bitmap.o \ + monodll_colour.o \ + monodll_dcmemory.o \ + monodll_display.o \ + monodll_fontenum.o \ + monodll_hid.o \ + monodll_printmac.o \ + monodll_timer.o \ + monodll_utilsexc_cf.o +@COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___MAC_LOWLEVEL_SRC_OBJECTS) @COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS = monodll_apptraits.o @COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS = monodll_apptraits.o COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS = \ @@ -11939,8 +11824,53 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS = \ monodll_sound.o \ monodll_taskbarx11.o @COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS) -@COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_0 \ -@COND_PLATFORM_MACOSX_1@ = monolib_hid.o monolib_utilsexc_cf.o +COND_PLATFORM_MACOSX_1___MAC_LOWLEVEL_SRC_OBJECTS_0 = \ + monolib_accel.o \ + monolib_artmac.o \ + monolib_bmpbuttn_osx.o \ + monolib_brush.o \ + monolib_button_osx.o \ + monolib_checkbox_osx.o \ + monolib_checklst_osx.o \ + monolib_choice_osx.o \ + monolib_dialog_osx.o \ + monolib_fontutil.o \ + monolib_gauge_osx.o \ + monolib_imaglist.o \ + monolib_listbox_osx.o \ + monolib_menu_osx.o \ + monolib_menuitem_osx.o \ + monolib_minifram.o \ + monolib_nonownedwnd_osx.o \ + monolib_notebook_osx.o \ + monolib_palette.o \ + monolib_pen.o \ + monolib_radiobox_osx.o \ + monolib_radiobut_osx.o \ + monolib_scrolbar_osx.o \ + monolib_slider_osx.o \ + monolib_spinbutt_osx.o \ + monolib_spinctrl_osx.o \ + monolib_statbox_osx.o \ + monolib_statline_osx.o \ + monolib_stattext_osx.o \ + monolib_tabctrl_osx.o \ + monolib_textctrl_osx.o \ + monolib_tglbtn_osx.o \ + monolib_toolbar_osx.o \ + monolib_toplevel_osx.o \ + monolib_utils_osx.o \ + monolib_window_osx.o \ + monolib_bitmap.o \ + monolib_colour.o \ + monolib_dcmemory.o \ + monolib_display.o \ + monolib_fontenum.o \ + monolib_hid.o \ + monolib_printmac.o \ + monolib_timer.o \ + monolib_utilsexc_cf.o +@COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_0 = $(COND_PLATFORM_MACOSX_1___MAC_LOWLEVEL_SRC_OBJECTS_0) @COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_0 = monolib_apptraits.o @COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS_0 = monolib_apptraits.o COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \ @@ -12016,21 +11946,111 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \ monolib_sound.o \ monolib_taskbarx11.o @COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_0) -@COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_8 \ -@COND_PLATFORM_MACOSX_1@ = coredll_hid.o coredll_utilsexc_cf.o -@COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_8 = coredll_apptraits.o -@COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS_8 = coredll_apptraits.o -@COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_9 \ -@COND_PLATFORM_MACOSX_1@ = corelib_hid.o corelib_utilsexc_cf.o -@COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_9 = corelib_apptraits.o -@COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS_9 = corelib_apptraits.o -@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS_8 \ -@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@ = advdll_taskbarcmn.o advdll_joystick.o \ -@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@ advdll_sound.o advdll_taskbarx11.o -COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \ - advdll_taskbar.o \ - advdll_taskbarcmn.o \ - advdll_animateg.o \ +COND_PLATFORM_MACOSX_1___MAC_LOWLEVEL_SRC_OBJECTS_8 = \ + coredll_accel.o \ + coredll_artmac.o \ + coredll_bmpbuttn_osx.o \ + coredll_brush.o \ + coredll_button_osx.o \ + coredll_checkbox_osx.o \ + coredll_checklst_osx.o \ + coredll_choice_osx.o \ + coredll_dialog_osx.o \ + coredll_fontutil.o \ + coredll_gauge_osx.o \ + coredll_imaglist.o \ + coredll_listbox_osx.o \ + coredll_menu_osx.o \ + coredll_menuitem_osx.o \ + coredll_minifram.o \ + coredll_nonownedwnd_osx.o \ + coredll_notebook_osx.o \ + coredll_palette.o \ + coredll_pen.o \ + coredll_radiobox_osx.o \ + coredll_radiobut_osx.o \ + coredll_scrolbar_osx.o \ + coredll_slider_osx.o \ + coredll_spinbutt_osx.o \ + coredll_spinctrl_osx.o \ + coredll_statbox_osx.o \ + coredll_statline_osx.o \ + coredll_stattext_osx.o \ + coredll_tabctrl_osx.o \ + coredll_textctrl_osx.o \ + coredll_tglbtn_osx.o \ + coredll_toolbar_osx.o \ + coredll_toplevel_osx.o \ + coredll_utils_osx.o \ + coredll_window_osx.o \ + coredll_bitmap.o \ + coredll_colour.o \ + coredll_dcmemory.o \ + coredll_display.o \ + coredll_fontenum.o \ + coredll_hid.o \ + coredll_printmac.o \ + coredll_timer.o \ + coredll_utilsexc_cf.o +@COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_8 = $(COND_PLATFORM_MACOSX_1___MAC_LOWLEVEL_SRC_OBJECTS_8) +@COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_8 = coredll_apptraits.o +@COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS_8 = coredll_apptraits.o +COND_PLATFORM_MACOSX_1___MAC_LOWLEVEL_SRC_OBJECTS_9 = \ + corelib_accel.o \ + corelib_artmac.o \ + corelib_bmpbuttn_osx.o \ + corelib_brush.o \ + corelib_button_osx.o \ + corelib_checkbox_osx.o \ + corelib_checklst_osx.o \ + corelib_choice_osx.o \ + corelib_dialog_osx.o \ + corelib_fontutil.o \ + corelib_gauge_osx.o \ + corelib_imaglist.o \ + corelib_listbox_osx.o \ + corelib_menu_osx.o \ + corelib_menuitem_osx.o \ + corelib_minifram.o \ + corelib_nonownedwnd_osx.o \ + corelib_notebook_osx.o \ + corelib_palette.o \ + corelib_pen.o \ + corelib_radiobox_osx.o \ + corelib_radiobut_osx.o \ + corelib_scrolbar_osx.o \ + corelib_slider_osx.o \ + corelib_spinbutt_osx.o \ + corelib_spinctrl_osx.o \ + corelib_statbox_osx.o \ + corelib_statline_osx.o \ + corelib_stattext_osx.o \ + corelib_tabctrl_osx.o \ + corelib_textctrl_osx.o \ + corelib_tglbtn_osx.o \ + corelib_toolbar_osx.o \ + corelib_toplevel_osx.o \ + corelib_utils_osx.o \ + corelib_window_osx.o \ + corelib_bitmap.o \ + corelib_colour.o \ + corelib_dcmemory.o \ + corelib_display.o \ + corelib_fontenum.o \ + corelib_hid.o \ + corelib_printmac.o \ + corelib_timer.o \ + corelib_utilsexc_cf.o +@COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_9 = $(COND_PLATFORM_MACOSX_1___MAC_LOWLEVEL_SRC_OBJECTS_9) +@COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_9 = corelib_apptraits.o +@COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS_9 = corelib_apptraits.o +@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS_8 \ +@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@ = advdll_taskbarcmn.o advdll_joystick.o \ +@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@ advdll_sound.o advdll_taskbarx11.o +COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \ + advdll_taskbar.o \ + advdll_taskbarcmn.o \ + advdll_animateg.o \ advdll_hidjoystick.o @COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8) COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_8 = \ @@ -13946,9 +13966,6 @@ monodll_mslu.o: $(srcdir)/src/msw/mslu.cpp $(MONODLL_ODEP) monodll_volume.o: $(srcdir)/src/msw/volume.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/volume.cpp -monodll_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp - monodll_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp @@ -14072,87 +14089,6 @@ monodll_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(MONODLL_ODEP) monodll_statlmac.o: $(srcdir)/src/osx/carbon/statlmac.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statlmac.cpp -monodll_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp - -monodll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp - -monodll_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp - -monodll_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp - -monodll_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp - -monodll_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp - -monodll_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp - -monodll_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp - -monodll_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp - -monodll_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp - -monodll_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp - -monodll_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp - -monodll_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp - -monodll_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp - -monodll_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp - -monodll_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp - -monodll_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp - -monodll_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp - -monodll_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp - -monodll_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp - -monodll_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp - -monodll_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp - -monodll_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp - -monodll_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp - -monodll_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp - -monodll_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp - -monodll_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp - monodll_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm @@ -14945,6 +14881,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_timer.o: $(srcdir)/src/gtk1/timer.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/timer.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_timer.o: $(srcdir)/src/osx/core/timer.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp + @COND_TOOLKIT_X11_USE_GUI_1@monodll_timer.o: $(srcdir)/src/generic/timer.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp @@ -14957,9 +14896,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_timer.o: $(srcdir)/src/motif/timer.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/timer.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_timer.o: $(srcdir)/src/osx/core/timer.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp - @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_timer.o: $(srcdir)/src/cocoa/timer.mm $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/timer.mm @@ -15209,8 +15145,8 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp @@ -15248,15 +15184,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp + @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) $(srcdir)/src/mgl/fontenum.cpp @COND_TOOLKIT_DFB_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(MONODLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp - @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) $(srcdir)/src/cocoa/fontenum.mm @@ -15281,12 +15217,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp + @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) $(srcdir)/src/mgl/fontutil.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp - @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) $(srcdir)/src/cocoa/fontutil.cpp @@ -15413,15 +15349,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp + @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) $(srcdir)/src/mgl/bitmap.cpp @COND_TOOLKIT_DFB_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/dfb/bitmap.cpp $(MONODLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/bitmap.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp - @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) $(srcdir)/src/cocoa/bitmap.mm @@ -15446,15 +15382,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_brush.o: $(srcdir)/src/msw/brush.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/brush.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_brush.o: $(srcdir)/src/osx/brush.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/brush.cpp + @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) $(srcdir)/src/mgl/brush.cpp @COND_TOOLKIT_DFB_USE_GUI_1@monodll_brush.o: $(srcdir)/src/dfb/brush.cpp $(MONODLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/brush.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_brush.o: $(srcdir)/src/osx/brush.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/brush.cpp - @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) $(srcdir)/src/cocoa/brush.mm @@ -15503,6 +15439,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_colour.o: $(srcdir)/src/msw/colour.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/colour.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp + @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) $(srcdir)/src/x11/colour.cpp @@ -15515,9 +15454,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @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) $(srcdir)/src/motif/colour.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp - @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) $(srcdir)/src/cocoa/colour.mm @@ -15659,6 +15595,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp + @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) $(srcdir)/src/x11/dcmemory.cpp @@ -15671,9 +15610,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @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) $(srcdir)/src/motif/dcmemory.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp - @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) $(srcdir)/src/cocoa/dcmemory.mm @@ -15779,15 +15715,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_minifram.o: $(srcdir)/src/osx/minifram.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp + @COND_TOOLKIT_X11_USE_GUI_1@monodll_minifram.o: $(srcdir)/src/x11/minifram.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/minifram.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_minifram.o: $(srcdir)/src/motif/minifram.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_minifram.o: $(srcdir)/src/osx/minifram.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_minifram.o: $(srcdir)/src/os2/minifram.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp @@ -15809,15 +15745,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_pen.o: $(srcdir)/src/msw/pen.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/pen.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_pen.o: $(srcdir)/src/osx/pen.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/pen.cpp + @COND_TOOLKIT_MGL_USE_GUI_1@monodll_pen.o: $(srcdir)/src/mgl/pen.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp @COND_TOOLKIT_DFB_USE_GUI_1@monodll_pen.o: $(srcdir)/src/dfb/pen.cpp $(MONODLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/pen.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_pen.o: $(srcdir)/src/osx/pen.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/pen.cpp - @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) $(srcdir)/src/cocoa/pen.mm @@ -15977,9 +15913,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @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) $(srcdir)/src/motif/toplevel.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_toplevel.o: $(srcdir)/src/osx/toplevel.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/toplevel.cpp - @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) $(srcdir)/src/cocoa/toplevel.mm @@ -16067,12 +16000,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_palette.o: $(srcdir)/src/msw/palette.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/palette.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_palette.o: $(srcdir)/src/osx/palette.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/palette.cpp + @COND_TOOLKIT_MGL_USE_GUI_1@monodll_palette.o: $(srcdir)/src/mgl/palette.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_palette.o: $(srcdir)/src/osx/palette.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/palette.cpp - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_palette.o: $(srcdir)/src/os2/palette.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/palette.cpp @@ -16106,8 +16039,8 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_display.o: $(srcdir)/src/msw/display.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/display.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_display.o: $(srcdir)/src/osx/core/display.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_display.o: $(srcdir)/src/osx/core/display.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_display.o: $(srcdir)/src/cocoa/display.mm $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/display.mm @@ -16214,12 +16147,129 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monodll_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_accel.o: $(srcdir)/src/osx/accel.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/accel.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp + +@COND_USE_GUI_1_WXUNIV_1@monodll_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp + +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/motif/accel.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/accel.cpp + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/msw/accel.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/msw/accel.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/os2/accel.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/accel.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp @COND_TOOLKIT_COCOA_USE_GUI_1@monodll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONODLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp @@ -16274,33 +16324,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_USE_GUI_1@monodll_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp - -@COND_USE_GUI_1_WXUNIV_1@monodll_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/motif/accel.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/accel.cpp - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/msw/accel.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/msw/accel.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/osx/accel.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/accel.cpp - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/os2/accel.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/accel.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp @@ -16580,9 +16603,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/osx/checklst.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/checklst.cpp - @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) $(srcdir)/src/cocoa/checklst.mm @@ -16973,9 +16993,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_radiobox.o: $(srcdir)/src/osx/radiobox.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/radiobox.cpp - @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) $(srcdir)/src/cocoa/radiobox.mm @@ -17111,9 +17128,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_spinctrl.o: $(srcdir)/src/osx/spinctrl.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/spinctrl.cpp - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp @@ -18518,9 +18532,6 @@ monolib_mslu.o: $(srcdir)/src/msw/mslu.cpp $(MONOLIB_ODEP) monolib_volume.o: $(srcdir)/src/msw/volume.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/volume.cpp -monolib_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp - monolib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp @@ -18644,87 +18655,6 @@ monolib_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(MONOLIB_ODEP) monolib_statlmac.o: $(srcdir)/src/osx/carbon/statlmac.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statlmac.cpp -monolib_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp - -monolib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp - -monolib_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp - -monolib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp - -monolib_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp - -monolib_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp - -monolib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp - -monolib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp - -monolib_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp - -monolib_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp - -monolib_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp - -monolib_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp - -monolib_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp - -monolib_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp - -monolib_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp - -monolib_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp - -monolib_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp - -monolib_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp - -monolib_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp - -monolib_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp - -monolib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp - -monolib_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp - -monolib_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp - -monolib_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp - -monolib_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp - -monolib_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp - -monolib_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp - monolib_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm @@ -19517,6 +19447,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_timer.o: $(srcdir)/src/gtk1/timer.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/timer.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_timer.o: $(srcdir)/src/osx/core/timer.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp + @COND_TOOLKIT_X11_USE_GUI_1@monolib_timer.o: $(srcdir)/src/generic/timer.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp @@ -19529,9 +19462,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_timer.o: $(srcdir)/src/motif/timer.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/timer.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_timer.o: $(srcdir)/src/osx/core/timer.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp - @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_timer.o: $(srcdir)/src/cocoa/timer.mm $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/timer.mm @@ -19781,8 +19711,8 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp @@ -19820,15 +19750,15 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp + @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) $(srcdir)/src/mgl/fontenum.cpp @COND_TOOLKIT_DFB_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp - @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) $(srcdir)/src/cocoa/fontenum.mm @@ -19853,12 +19783,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp + @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) $(srcdir)/src/mgl/fontutil.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp - @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) $(srcdir)/src/cocoa/fontutil.cpp @@ -19985,15 +19915,15 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp + @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) $(srcdir)/src/mgl/bitmap.cpp @COND_TOOLKIT_DFB_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/dfb/bitmap.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/bitmap.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp - @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) $(srcdir)/src/cocoa/bitmap.mm @@ -20018,15 +19948,15 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_brush.o: $(srcdir)/src/msw/brush.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/brush.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_brush.o: $(srcdir)/src/osx/brush.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/brush.cpp + @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) $(srcdir)/src/mgl/brush.cpp @COND_TOOLKIT_DFB_USE_GUI_1@monolib_brush.o: $(srcdir)/src/dfb/brush.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/brush.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_brush.o: $(srcdir)/src/osx/brush.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/brush.cpp - @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) $(srcdir)/src/cocoa/brush.mm @@ -20075,6 +20005,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_colour.o: $(srcdir)/src/msw/colour.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/colour.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp + @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) $(srcdir)/src/x11/colour.cpp @@ -20087,9 +20020,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @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) $(srcdir)/src/motif/colour.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp - @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) $(srcdir)/src/cocoa/colour.mm @@ -20231,6 +20161,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp + @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) $(srcdir)/src/x11/dcmemory.cpp @@ -20243,9 +20176,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @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) $(srcdir)/src/motif/dcmemory.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp - @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) $(srcdir)/src/cocoa/dcmemory.mm @@ -20351,15 +20281,15 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_minifram.o: $(srcdir)/src/osx/minifram.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp + @COND_TOOLKIT_X11_USE_GUI_1@monolib_minifram.o: $(srcdir)/src/x11/minifram.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/minifram.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_minifram.o: $(srcdir)/src/motif/minifram.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_minifram.o: $(srcdir)/src/osx/minifram.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_minifram.o: $(srcdir)/src/os2/minifram.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp @@ -20381,15 +20311,15 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_pen.o: $(srcdir)/src/msw/pen.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/pen.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_pen.o: $(srcdir)/src/osx/pen.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/pen.cpp + @COND_TOOLKIT_MGL_USE_GUI_1@monolib_pen.o: $(srcdir)/src/mgl/pen.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp @COND_TOOLKIT_DFB_USE_GUI_1@monolib_pen.o: $(srcdir)/src/dfb/pen.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/pen.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_pen.o: $(srcdir)/src/osx/pen.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/pen.cpp - @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) $(srcdir)/src/cocoa/pen.mm @@ -20549,9 +20479,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @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) $(srcdir)/src/motif/toplevel.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_toplevel.o: $(srcdir)/src/osx/toplevel.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/toplevel.cpp - @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) $(srcdir)/src/cocoa/toplevel.mm @@ -20639,12 +20566,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_palette.o: $(srcdir)/src/msw/palette.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/palette.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_palette.o: $(srcdir)/src/osx/palette.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/palette.cpp + @COND_TOOLKIT_MGL_USE_GUI_1@monolib_palette.o: $(srcdir)/src/mgl/palette.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_palette.o: $(srcdir)/src/osx/palette.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/palette.cpp - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_palette.o: $(srcdir)/src/os2/palette.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/palette.cpp @@ -20678,8 +20605,8 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_display.o: $(srcdir)/src/msw/display.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/display.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_display.o: $(srcdir)/src/osx/core/display.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_display.o: $(srcdir)/src/osx/core/display.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_display.o: $(srcdir)/src/cocoa/display.mm $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/display.mm @@ -20786,12 +20713,129 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monolib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_accel.o: $(srcdir)/src/osx/accel.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp + +@COND_USE_GUI_1_WXUNIV_1@monolib_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp + +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/motif/accel.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/accel.cpp + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/msw/accel.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/msw/accel.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/os2/accel.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/accel.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp @COND_TOOLKIT_COCOA_USE_GUI_1@monolib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp @@ -20846,33 +20890,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_USE_GUI_1@monolib_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp - -@COND_USE_GUI_1_WXUNIV_1@monolib_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/motif/accel.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/accel.cpp - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/msw/accel.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/msw/accel.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/osx/accel.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/os2/accel.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/accel.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp @@ -21152,9 +21169,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/osx/checklst.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/checklst.cpp - @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) $(srcdir)/src/cocoa/checklst.mm @@ -21545,9 +21559,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_radiobox.o: $(srcdir)/src/osx/radiobox.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/radiobox.cpp - @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) $(srcdir)/src/cocoa/radiobox.mm @@ -21683,9 +21694,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_spinctrl.o: $(srcdir)/src/osx/spinctrl.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl.cpp - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp @@ -23099,9 +23107,6 @@ basedll_mslu.o: $(srcdir)/src/msw/mslu.cpp $(BASEDLL_ODEP) basedll_volume.o: $(srcdir)/src/msw/volume.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/volume.cpp -basedll_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(BASEDLL_ODEP) - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp - basedll_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp @@ -23849,9 +23854,6 @@ baselib_mslu.o: $(srcdir)/src/msw/mslu.cpp $(BASELIB_ODEP) baselib_volume.o: $(srcdir)/src/msw/volume.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/volume.cpp -baselib_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(BASELIB_ODEP) - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp - baselib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp @@ -24437,9 +24439,6 @@ coredll_mslu.o: $(srcdir)/src/msw/mslu.cpp $(COREDLL_ODEP) coredll_volume.o: $(srcdir)/src/msw/volume.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/volume.cpp -coredll_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp - coredll_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp @@ -24524,87 +24523,6 @@ coredll_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(COREDLL_ODEP) coredll_statlmac.o: $(srcdir)/src/osx/carbon/statlmac.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statlmac.cpp -coredll_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp - -coredll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp - -coredll_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp - -coredll_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp - -coredll_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp - -coredll_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp - -coredll_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp - -coredll_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp - -coredll_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp - -coredll_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp - -coredll_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp - -coredll_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp - -coredll_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp - -coredll_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp - -coredll_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp - -coredll_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp - -coredll_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp - -coredll_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp - -coredll_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp - -coredll_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp - -coredll_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp - -coredll_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp - -coredll_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp - -coredll_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp - -coredll_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp - -coredll_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp - -coredll_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp - coredll_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm @@ -24848,8 +24766,8 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp @@ -24887,15 +24805,15 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp + @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) $(srcdir)/src/mgl/fontenum.cpp @COND_TOOLKIT_DFB_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(COREDLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp - @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) $(srcdir)/src/cocoa/fontenum.mm @@ -24920,12 +24838,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp + @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) $(srcdir)/src/mgl/fontutil.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp - @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) $(srcdir)/src/cocoa/fontutil.cpp @@ -25052,15 +24970,15 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp + @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) $(srcdir)/src/mgl/bitmap.cpp @COND_TOOLKIT_DFB_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/dfb/bitmap.cpp $(COREDLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/bitmap.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp - @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) $(srcdir)/src/cocoa/bitmap.mm @@ -25085,15 +25003,15 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_brush.o: $(srcdir)/src/msw/brush.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/brush.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_brush.o: $(srcdir)/src/osx/brush.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/brush.cpp + @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) $(srcdir)/src/mgl/brush.cpp @COND_TOOLKIT_DFB_USE_GUI_1@coredll_brush.o: $(srcdir)/src/dfb/brush.cpp $(COREDLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/brush.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_brush.o: $(srcdir)/src/osx/brush.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/brush.cpp - @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) $(srcdir)/src/cocoa/brush.mm @@ -25142,6 +25060,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_colour.o: $(srcdir)/src/msw/colour.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/colour.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_colour.o: $(srcdir)/src/osx/core/colour.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp + @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) $(srcdir)/src/x11/colour.cpp @@ -25154,9 +25075,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @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) $(srcdir)/src/motif/colour.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_colour.o: $(srcdir)/src/osx/core/colour.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp - @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) $(srcdir)/src/cocoa/colour.mm @@ -25298,6 +25216,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp + @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) $(srcdir)/src/x11/dcmemory.cpp @@ -25310,9 +25231,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @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) $(srcdir)/src/motif/dcmemory.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp - @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) $(srcdir)/src/cocoa/dcmemory.mm @@ -25418,15 +25336,15 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_minifram.o: $(srcdir)/src/msw/minifram.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_minifram.o: $(srcdir)/src/osx/minifram.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp + @COND_TOOLKIT_X11_USE_GUI_1@coredll_minifram.o: $(srcdir)/src/x11/minifram.cpp $(COREDLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/minifram.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_minifram.o: $(srcdir)/src/motif/minifram.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_minifram.o: $(srcdir)/src/osx/minifram.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_minifram.o: $(srcdir)/src/os2/minifram.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp @@ -25448,15 +25366,15 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_pen.o: $(srcdir)/src/msw/pen.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/pen.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_pen.o: $(srcdir)/src/osx/pen.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/pen.cpp + @COND_TOOLKIT_MGL_USE_GUI_1@coredll_pen.o: $(srcdir)/src/mgl/pen.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp @COND_TOOLKIT_DFB_USE_GUI_1@coredll_pen.o: $(srcdir)/src/dfb/pen.cpp $(COREDLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/pen.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_pen.o: $(srcdir)/src/osx/pen.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/pen.cpp - @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) $(srcdir)/src/cocoa/pen.mm @@ -25577,6 +25495,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_timer.o: $(srcdir)/src/gtk1/timer.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/timer.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_timer.o: $(srcdir)/src/osx/core/timer.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp + @COND_TOOLKIT_X11_USE_GUI_1@coredll_timer.o: $(srcdir)/src/generic/timer.cpp $(COREDLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp @@ -25589,9 +25510,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_timer.o: $(srcdir)/src/motif/timer.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/timer.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_timer.o: $(srcdir)/src/osx/core/timer.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp - @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_timer.o: $(srcdir)/src/cocoa/timer.mm $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/timer.mm @@ -25643,9 +25561,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @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) $(srcdir)/src/motif/toplevel.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_toplevel.o: $(srcdir)/src/osx/toplevel.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/toplevel.cpp - @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) $(srcdir)/src/cocoa/toplevel.mm @@ -25733,12 +25648,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_palette.o: $(srcdir)/src/msw/palette.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/palette.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_palette.o: $(srcdir)/src/osx/palette.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/palette.cpp + @COND_TOOLKIT_MGL_USE_GUI_1@coredll_palette.o: $(srcdir)/src/mgl/palette.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_palette.o: $(srcdir)/src/osx/palette.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/palette.cpp - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_palette.o: $(srcdir)/src/os2/palette.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/palette.cpp @@ -25772,8 +25687,8 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_display.o: $(srcdir)/src/msw/display.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/display.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_display.o: $(srcdir)/src/osx/core/display.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_display.o: $(srcdir)/src/osx/core/display.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_display.o: $(srcdir)/src/cocoa/display.mm $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/display.mm @@ -25880,12 +25795,129 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@coredll_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_accel.o: $(srcdir)/src/osx/accel.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/accel.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp + +@COND_USE_GUI_1_WXUNIV_1@coredll_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp + +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/motif/accel.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/accel.cpp + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/msw/accel.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/msw/accel.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/os2/accel.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/accel.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp @COND_TOOLKIT_COCOA_USE_GUI_1@coredll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(COREDLL_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp @@ -25940,33 +25972,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_USE_GUI_1@coredll_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp - -@COND_USE_GUI_1_WXUNIV_1@coredll_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/motif/accel.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/accel.cpp - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/msw/accel.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/msw/accel.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/osx/accel.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/accel.cpp - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/os2/accel.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/accel.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp @@ -26246,9 +26251,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/osx/checklst.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/checklst.cpp - @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) $(srcdir)/src/cocoa/checklst.mm @@ -26639,9 +26641,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_radiobox.o: $(srcdir)/src/osx/radiobox.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/radiobox.cpp - @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) $(srcdir)/src/cocoa/radiobox.mm @@ -26777,9 +26776,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_spinctrl.o: $(srcdir)/src/osx/spinctrl.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/spinctrl.cpp - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp @@ -27590,9 +27586,6 @@ corelib_mslu.o: $(srcdir)/src/msw/mslu.cpp $(CORELIB_ODEP) corelib_volume.o: $(srcdir)/src/msw/volume.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/volume.cpp -corelib_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp - corelib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp @@ -27677,87 +27670,6 @@ corelib_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(CORELIB_ODEP) corelib_statlmac.o: $(srcdir)/src/osx/carbon/statlmac.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statlmac.cpp -corelib_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp - -corelib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp - -corelib_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp - -corelib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp - -corelib_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp - -corelib_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp - -corelib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp - -corelib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp - -corelib_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp - -corelib_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp - -corelib_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp - -corelib_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp - -corelib_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp - -corelib_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp - -corelib_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp - -corelib_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp - -corelib_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp - -corelib_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp - -corelib_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp - -corelib_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp - -corelib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp - -corelib_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp - -corelib_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp - -corelib_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp - -corelib_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp - -corelib_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp - -corelib_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp - corelib_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm @@ -28001,8 +27913,8 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp @@ -28040,15 +27952,15 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp + @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) $(srcdir)/src/mgl/fontenum.cpp @COND_TOOLKIT_DFB_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(CORELIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp - @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) $(srcdir)/src/cocoa/fontenum.mm @@ -28073,12 +27985,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp + @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) $(srcdir)/src/mgl/fontutil.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp - @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) $(srcdir)/src/cocoa/fontutil.cpp @@ -28205,15 +28117,15 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp + @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) $(srcdir)/src/mgl/bitmap.cpp @COND_TOOLKIT_DFB_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/dfb/bitmap.cpp $(CORELIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/bitmap.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp - @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) $(srcdir)/src/cocoa/bitmap.mm @@ -28238,15 +28150,15 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_brush.o: $(srcdir)/src/msw/brush.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/brush.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_brush.o: $(srcdir)/src/osx/brush.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/brush.cpp + @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) $(srcdir)/src/mgl/brush.cpp @COND_TOOLKIT_DFB_USE_GUI_1@corelib_brush.o: $(srcdir)/src/dfb/brush.cpp $(CORELIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/brush.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_brush.o: $(srcdir)/src/osx/brush.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/brush.cpp - @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) $(srcdir)/src/cocoa/brush.mm @@ -28295,6 +28207,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_colour.o: $(srcdir)/src/msw/colour.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/colour.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_colour.o: $(srcdir)/src/osx/core/colour.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp + @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) $(srcdir)/src/x11/colour.cpp @@ -28307,9 +28222,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @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) $(srcdir)/src/motif/colour.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_colour.o: $(srcdir)/src/osx/core/colour.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp - @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) $(srcdir)/src/cocoa/colour.mm @@ -28451,6 +28363,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp + @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) $(srcdir)/src/x11/dcmemory.cpp @@ -28463,9 +28378,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @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) $(srcdir)/src/motif/dcmemory.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp - @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) $(srcdir)/src/cocoa/dcmemory.mm @@ -28571,15 +28483,15 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_minifram.o: $(srcdir)/src/msw/minifram.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_minifram.o: $(srcdir)/src/osx/minifram.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp + @COND_TOOLKIT_X11_USE_GUI_1@corelib_minifram.o: $(srcdir)/src/x11/minifram.cpp $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/minifram.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_minifram.o: $(srcdir)/src/motif/minifram.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_minifram.o: $(srcdir)/src/osx/minifram.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_minifram.o: $(srcdir)/src/os2/minifram.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp @@ -28601,15 +28513,15 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_pen.o: $(srcdir)/src/msw/pen.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/pen.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_pen.o: $(srcdir)/src/osx/pen.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/pen.cpp + @COND_TOOLKIT_MGL_USE_GUI_1@corelib_pen.o: $(srcdir)/src/mgl/pen.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp @COND_TOOLKIT_DFB_USE_GUI_1@corelib_pen.o: $(srcdir)/src/dfb/pen.cpp $(CORELIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/pen.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_pen.o: $(srcdir)/src/osx/pen.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/pen.cpp - @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) $(srcdir)/src/cocoa/pen.mm @@ -28730,6 +28642,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_timer.o: $(srcdir)/src/gtk1/timer.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/timer.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_timer.o: $(srcdir)/src/osx/core/timer.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp + @COND_TOOLKIT_X11_USE_GUI_1@corelib_timer.o: $(srcdir)/src/generic/timer.cpp $(CORELIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp @@ -28742,9 +28657,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_timer.o: $(srcdir)/src/motif/timer.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/timer.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_timer.o: $(srcdir)/src/osx/core/timer.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp - @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_timer.o: $(srcdir)/src/cocoa/timer.mm $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/timer.mm @@ -28796,9 +28708,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @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) $(srcdir)/src/motif/toplevel.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_toplevel.o: $(srcdir)/src/osx/toplevel.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/toplevel.cpp - @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) $(srcdir)/src/cocoa/toplevel.mm @@ -28886,12 +28795,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_palette.o: $(srcdir)/src/msw/palette.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/palette.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_palette.o: $(srcdir)/src/osx/palette.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/palette.cpp + @COND_TOOLKIT_MGL_USE_GUI_1@corelib_palette.o: $(srcdir)/src/mgl/palette.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_palette.o: $(srcdir)/src/osx/palette.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/palette.cpp - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_palette.o: $(srcdir)/src/os2/palette.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/palette.cpp @@ -28925,8 +28834,8 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_display.o: $(srcdir)/src/msw/display.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/display.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_display.o: $(srcdir)/src/osx/core/display.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_display.o: $(srcdir)/src/osx/core/display.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_display.o: $(srcdir)/src/cocoa/display.mm $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/display.mm @@ -29033,12 +28942,129 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@corelib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/uuid.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_accel.o: $(srcdir)/src/osx/accel.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp + +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp + +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp + +@COND_USE_GUI_1_WXUNIV_1@corelib_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp + +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/motif/accel.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/accel.cpp + +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/msw/accel.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/msw/accel.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/os2/accel.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/accel.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp + +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp @COND_TOOLKIT_COCOA_USE_GUI_1@corelib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(CORELIB_ODEP) @COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp + @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp @@ -29093,33 +29119,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_USE_GUI_1@corelib_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp - -@COND_USE_GUI_1_WXUNIV_1@corelib_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/motif/accel.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/accel.cpp - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/msw/accel.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp - -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/msw/accel.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/osx/accel.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/os2/accel.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/accel.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp @@ -29399,9 +29398,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/osx/checklst.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/checklst.cpp - @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) $(srcdir)/src/cocoa/checklst.mm @@ -29792,9 +29788,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_radiobox.o: $(srcdir)/src/osx/radiobox.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/radiobox.cpp - @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) $(srcdir)/src/cocoa/radiobox.mm @@ -29930,9 +29923,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_spinctrl.o: $(srcdir)/src/osx/spinctrl.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl.cpp - @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp @@ -32054,6 +32044,9 @@ gldll_version_rc.o: $(srcdir)/src/msw/version.rc $(GLDLL_ODEP) gldll_glcmn.o: $(srcdir)/src/common/glcmn.cpp $(GLDLL_ODEP) $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/common/glcmn.cpp +gldll_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLDLL_ODEP) + $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp + @COND_TOOLKIT_MAC@gldll_glcanvas.o: $(srcdir)/src/osx/carbon/glcanvas.cpp $(GLDLL_ODEP) @COND_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/glcanvas.cpp @@ -32096,6 +32089,9 @@ gldll_glcmn.o: $(srcdir)/src/common/glcmn.cpp $(GLDLL_ODEP) gllib_glcmn.o: $(srcdir)/src/common/glcmn.cpp $(GLLIB_ODEP) $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/common/glcmn.cpp +gllib_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLLIB_ODEP) + $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp + @COND_TOOLKIT_MAC@gllib_glcanvas.o: $(srcdir)/src/osx/carbon/glcanvas.cpp $(GLLIB_ODEP) @COND_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/glcanvas.cpp diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 4c9e5afd6d..b48c6d6730 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -4527,7 +4527,7 @@ wxstc: $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP) !endif !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname) $(__monodll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\gldll_version.res | diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 58ca66dcd3..220796800f 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -4668,7 +4668,7 @@ endif ifeq ($(SHARED),1) ifeq ($(USE_GUI),1) ifeq ($(USE_OPENGL),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\gldll_version_rc.o $(__basedll___depname) $(__coredll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\gldll_version_rc.o $(__basedll___depname) $(__coredll___depname) $(__monodll___depname) $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(GLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32 endif endif diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 0fe9530a03..e8dcc8eb07 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -4861,7 +4861,7 @@ wxstc: $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP) !endif !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname) $(__monodll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<< $(GLDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib << diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index d1a516449f..198ec7fc2c 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -4888,7 +4888,7 @@ wxstc : .SYMBOLIC $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP) !ifeq SHARED 1 !ifeq USE_GUI 1 !ifeq USE_OPENGL 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_wat$(VENDORTAG).dll : $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_wat$(VENDORTAG).dll : $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname) $(__monodll___depname) @%create $(OBJS)\gldll.lbc @%append $(OBJS)\gldll.lbc option quiet @%append $(OBJS)\gldll.lbc name $^@ diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index 9a740c1a28..10716937ce 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -6383,6 +6383,10 @@ SOURCE=..\..\include\wx\tipwin.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\tls.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\toolbar.h # End Source File # Begin Source File diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj index 7ba9e05de8..6067294f97 100644 --- a/build/msw/wx_vc7_core.vcproj +++ b/build/msw/wx_vc7_core.vcproj @@ -3524,6 +3524,8 @@ RelativePath="..\..\include\wx\tipdlg.h"/> + + diff --git a/configure b/configure index 8019ade16f..aa611898d7 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 54996 2008-08-06 17:50:06Z VZ . +# From configure.in Id: configure.in 55019 2008-08-08 02:59:32Z VZ . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. # @@ -864,6 +864,7 @@ COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0 COND_PLATFORM_MACOSX_1_TOOLKIT_ COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA +COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA_USE_GUI_1 COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1 @@ -49692,6 +49693,11 @@ EOF COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="" fi + COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA_USE_GUI_1="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA_USE_GUI_1="" + fi + COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="#" if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" ; then COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="" @@ -51685,6 +51691,7 @@ COND_PLATFORM_MACOSX_1!$COND_PLATFORM_MACOSX_1$ac_delim COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0!$COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0$ac_delim COND_PLATFORM_MACOSX_1_TOOLKIT_!$COND_PLATFORM_MACOSX_1_TOOLKIT_$ac_delim COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA!$COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA$ac_delim +COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA_USE_GUI_1$ac_delim COND_PLATFORM_MACOSX_1_TOOLKIT_GTK!$COND_PLATFORM_MACOSX_1_TOOLKIT_GTK$ac_delim COND_PLATFORM_MACOSX_1_TOOLKIT_MAC!$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC$ac_delim COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1$ac_delim @@ -51727,7 +51734,6 @@ COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim -COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -51769,6 +51775,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim @@ -51865,7 +51872,6 @@ LDFLAGS_GL!$LDFLAGS_GL$ac_delim OPENGL_LIBS!$OPENGL_LIBS$ac_delim DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim WX_VERSION_TAG!$WX_VERSION_TAG$ac_delim -RESCOMP!$RESCOMP$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -51907,6 +51913,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +RESCOMP!$RESCOMP$ac_delim RESFLAGS!$RESFLAGS$ac_delim RESPROGRAMOBJ!$RESPROGRAMOBJ$ac_delim WX_RESOURCES_MACOSX_ASCII!$WX_RESOURCES_MACOSX_ASCII$ac_delim @@ -51921,7 +51928,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/demos/Makefile.in b/demos/Makefile.in index 9c53cf9aae..b558183666 100644 --- a/demos/Makefile.in +++ b/demos/Makefile.in @@ -63,6 +63,6 @@ poem: # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean bombs forty fractal life poem diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in index bc3b28eb86..c7e17e1887 100644 --- a/demos/bombs/Makefile.in +++ b/demos/bombs/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -72,28 +71,20 @@ BOMBS_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__bombs___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__bombs___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C bombs$(EXEEXT) -@COND_PLATFORM_MAC_1@__bombs___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL bombs$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___bombs___os2_emxbindcmd = $(NM) bombs$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep bombs$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__bombs___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___bombs___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__bombs_os2_lib_res = \ @@ -131,12 +122,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - bombs$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -158,8 +143,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile bombs$(EXEEXT): $(BOMBS_OBJECTS) $(__bombs___win32rc) - $(CXX) -o $@ $(BOMBS_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__bombs___mac_rezcmd) + $(CXX) -o $@ $(BOMBS_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__bombs___mac_setfilecmd) $(__bombs___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -199,7 +184,16 @@ bombs_bombs_rc.o: $(srcdir)/bombs.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean bombs_bundle diff --git a/demos/bombs/makefile.bcc b/demos/bombs/makefile.bcc index 235ccc5b05..c7d06cbf5a 100644 --- a/demos/bombs/makefile.bcc +++ b/demos/bombs/makefile.bcc @@ -231,7 +231,7 @@ clean: -if exist $(OBJS)\bombs.ils del $(OBJS)\bombs.ils $(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\bombs_bombs.res | diff --git a/demos/bombs/makefile.gcc b/demos/bombs/makefile.gcc index 2708e09338..55f16cf9d4 100644 --- a/demos/bombs/makefile.gcc +++ b/demos/bombs/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -226,7 +226,7 @@ clean: -if exist $(OBJS)\bombs.exe del $(OBJS)\bombs.exe $(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs_rc.o - $(CXX) -o $@ $(BOMBS_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(BOMBS_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\bombs_bombs.o: ./bombs.cpp $(CXX) -c -o $@ $(BOMBS_CXXFLAGS) $(CPPDEPS) $< diff --git a/demos/bombs/makefile.vc b/demos/bombs/makefile.vc index ad7fadcbc7..404596c2e7 100644 --- a/demos/bombs/makefile.vc +++ b/demos/bombs/makefile.vc @@ -307,7 +307,7 @@ clean: -if exist $(OBJS)\bombs.pdb del $(OBJS)\bombs.pdb $(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\bombs.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\bombs.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(BOMBS_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/demos/bombs/makefile.wat b/demos/bombs/makefile.wat index 4972ec0648..1b1b369517 100644 --- a/demos/bombs/makefile.wat +++ b/demos/bombs/makefile.wat @@ -253,7 +253,7 @@ $(OBJS)\bombs.exe : $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res @%append $(OBJS)\bombs.lbc option quiet @%append $(OBJS)\bombs.lbc name $^@ @%append $(OBJS)\bombs.lbc option caseexact - @%append $(OBJS)\bombs.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\bombs.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(BOMBS_OBJECTS)) do @%append $(OBJS)\bombs.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\bombs.lbc library %i @%append $(OBJS)\bombs.lbc option resource=$(OBJS)\bombs_bombs.res diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in index dac3e23079..df43a5537c 100644 --- a/demos/forty/Makefile.in +++ b/demos/forty/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -81,28 +80,20 @@ FORTY_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__forty___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__forty___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C forty$(EXEEXT) -@COND_PLATFORM_MAC_1@__forty___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL forty$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___forty___os2_emxbindcmd = $(NM) forty$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep forty$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__forty___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___forty___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__forty_os2_lib_res = \ @@ -149,12 +140,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - forty$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -176,8 +161,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc) - $(CXX) -o $@ $(FORTY_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__forty___mac_rezcmd) + $(CXX) -o $@ $(FORTY_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__forty___mac_setfilecmd) $(__forty___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -244,7 +229,16 @@ forty_forty_rc.o: $(srcdir)/forty.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean forty_bundle data diff --git a/demos/forty/makefile.bcc b/demos/forty/makefile.bcc index 96b5d1b3b5..fd96d7b4c2 100644 --- a/demos/forty/makefile.bcc +++ b/demos/forty/makefile.bcc @@ -248,7 +248,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(FORTY_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\forty_forty.res | diff --git a/demos/forty/makefile.gcc b/demos/forty/makefile.gcc index c8fd3db588..5a9a7b9cb0 100644 --- a/demos/forty/makefile.gcc +++ b/demos/forty/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -243,7 +243,7 @@ clean: -if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe $(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty_rc.o - $(CXX) -o $@ $(FORTY_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(FORTY_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/demos/forty/makefile.vc b/demos/forty/makefile.vc index 2a4a819098..9bdcbee0ad 100644 --- a/demos/forty/makefile.vc +++ b/demos/forty/makefile.vc @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\forty.pdb del $(OBJS)\forty.pdb $(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\forty.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\forty.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(FORTY_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/demos/forty/makefile.wat b/demos/forty/makefile.wat index e0649b21be..997c88817e 100644 --- a/demos/forty/makefile.wat +++ b/demos/forty/makefile.wat @@ -273,7 +273,7 @@ $(OBJS)\forty.exe : $(FORTY_OBJECTS) $(OBJS)\forty_forty.res @%append $(OBJS)\forty.lbc option quiet @%append $(OBJS)\forty.lbc name $^@ @%append $(OBJS)\forty.lbc option caseexact - @%append $(OBJS)\forty.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\forty.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(FORTY_OBJECTS)) do @%append $(OBJS)\forty.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\forty.lbc library %i @%append $(OBJS)\forty.lbc option resource=$(OBJS)\forty_forty.res diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in index 424c2a2bb8..9fac2dc167 100644 --- a/demos/fractal/Makefile.in +++ b/demos/fractal/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ FRACTAL_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__fractal___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__fractal___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C fractal$(EXEEXT) -@COND_PLATFORM_MAC_1@__fractal___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL fractal$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___fractal___os2_emxbindcmd = $(NM) fractal$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep fractal$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__fractal___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___fractal___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__fractal_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - fractal$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___win32rc) - $(CXX) -o $@ $(FRACTAL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__fractal___mac_rezcmd) + $(CXX) -o $@ $(FRACTAL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__fractal___mac_setfilecmd) $(__fractal___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ fractal_fractal_rc.o: $(srcdir)/fractal.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean fractal_bundle diff --git a/demos/fractal/makefile.bcc b/demos/fractal/makefile.bcc index 6b21778c54..0ca8cba880 100644 --- a/demos/fractal/makefile.bcc +++ b/demos/fractal/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\fractal_fractal.res | diff --git a/demos/fractal/makefile.gcc b/demos/fractal/makefile.gcc index 185af559b2..225bf1aa39 100644 --- a/demos/fractal/makefile.gcc +++ b/demos/fractal/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\fractal.exe del $(OBJS)\fractal.exe $(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal_rc.o - $(CXX) -o $@ $(FRACTAL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(FRACTAL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\fractal_fractal.o: ./fractal.cpp $(CXX) -c -o $@ $(FRACTAL_CXXFLAGS) $(CPPDEPS) $< diff --git a/demos/fractal/makefile.vc b/demos/fractal/makefile.vc index 4a05909b03..5ab3121fb7 100644 --- a/demos/fractal/makefile.vc +++ b/demos/fractal/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\fractal.pdb del $(OBJS)\fractal.pdb $(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\fractal.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\fractal.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(FRACTAL_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/demos/fractal/makefile.wat b/demos/fractal/makefile.wat index 37012cccdb..b1e763203e 100644 --- a/demos/fractal/makefile.wat +++ b/demos/fractal/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\fractal.exe : $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res @%append $(OBJS)\fractal.lbc option quiet @%append $(OBJS)\fractal.lbc name $^@ @%append $(OBJS)\fractal.lbc option caseexact - @%append $(OBJS)\fractal.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\fractal.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(FRACTAL_OBJECTS)) do @%append $(OBJS)\fractal.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\fractal.lbc library %i @%append $(OBJS)\fractal.lbc option resource=$(OBJS)\fractal_fractal.res diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in index b000d0af12..a9d37d7e47 100644 --- a/demos/life/Makefile.in +++ b/demos/life/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -73,28 +72,20 @@ LIFE_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__life___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__life___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C life$(EXEEXT) -@COND_PLATFORM_MAC_1@__life___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL life$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___life___os2_emxbindcmd = $(NM) life$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep life$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__life___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___life___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__life_os2_lib_res = \ @@ -132,12 +123,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - life$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -159,8 +144,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile life$(EXEEXT): $(LIFE_OBJECTS) $(__life___win32rc) - $(CXX) -o $@ $(LIFE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__life___mac_rezcmd) + $(CXX) -o $@ $(LIFE_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__life___mac_setfilecmd) $(__life___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -215,7 +200,16 @@ life_life_rc.o: $(srcdir)/life.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean life_bundle data diff --git a/demos/life/makefile.bcc b/demos/life/makefile.bcc index 471e873881..32bb96821f 100644 --- a/demos/life/makefile.bcc +++ b/demos/life/makefile.bcc @@ -232,7 +232,7 @@ clean: -if exist $(OBJS)\life.ils del $(OBJS)\life.ils $(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(LIFE_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\life_life.res | diff --git a/demos/life/makefile.gcc b/demos/life/makefile.gcc index cc796d5597..29d0be0c52 100644 --- a/demos/life/makefile.gcc +++ b/demos/life/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -227,7 +227,7 @@ clean: -if exist $(OBJS)\life.exe del $(OBJS)\life.exe $(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life_rc.o - $(CXX) -o $@ $(LIFE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(LIFE_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/demos/life/makefile.vc b/demos/life/makefile.vc index 28c427dde4..48e9132096 100644 --- a/demos/life/makefile.vc +++ b/demos/life/makefile.vc @@ -308,7 +308,7 @@ clean: -if exist $(OBJS)\life.pdb del $(OBJS)\life.pdb $(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\life.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\life.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(LIFE_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/demos/life/makefile.wat b/demos/life/makefile.wat index eb99c4259b..38ac687c4a 100644 --- a/demos/life/makefile.wat +++ b/demos/life/makefile.wat @@ -254,7 +254,7 @@ $(OBJS)\life.exe : $(LIFE_OBJECTS) $(OBJS)\life_life.res @%append $(OBJS)\life.lbc option quiet @%append $(OBJS)\life.lbc name $^@ @%append $(OBJS)\life.lbc option caseexact - @%append $(OBJS)\life.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\life.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(LIFE_OBJECTS)) do @%append $(OBJS)\life.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\life.lbc library %i @%append $(OBJS)\life.lbc option resource=$(OBJS)\life_life.res diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in index f68cf484e5..22d90ff50f 100644 --- a/demos/poem/Makefile.in +++ b/demos/poem/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -71,28 +70,20 @@ WXPOEM_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__wxpoem___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__wxpoem___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C wxpoem$(EXEEXT) -@COND_PLATFORM_MAC_1@__wxpoem___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL wxpoem$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___wxpoem___os2_emxbindcmd = $(NM) wxpoem$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep wxpoem$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__wxpoem___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___wxpoem___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__wxpoem_os2_lib_res = \ @@ -133,12 +124,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - wxpoem$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -160,8 +145,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile wxpoem$(EXEEXT): $(WXPOEM_OBJECTS) $(__wxpoem___win32rc) - $(CXX) -o $@ $(WXPOEM_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__wxpoem___mac_rezcmd) + $(CXX) -o $@ $(WXPOEM_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__wxpoem___mac_setfilecmd) $(__wxpoem___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -207,7 +192,16 @@ wxpoem_wxpoem_rc.o: $(srcdir)/wxpoem.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean wxpoem_bundle data diff --git a/demos/poem/makefile.bcc b/demos/poem/makefile.bcc index 9a9cf65d72..c41a374c13 100644 --- a/demos/poem/makefile.bcc +++ b/demos/poem/makefile.bcc @@ -233,7 +233,7 @@ clean: -if exist $(OBJS)\wxpoem.ils del $(OBJS)\wxpoem.ils $(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wxpoem_wxpoem.res | diff --git a/demos/poem/makefile.gcc b/demos/poem/makefile.gcc index aa9ac2b36b..5d4f9e6e52 100644 --- a/demos/poem/makefile.gcc +++ b/demos/poem/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: -if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe $(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem_rc.o - $(CXX) -o $@ $(WXPOEM_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(WXPOEM_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/demos/poem/makefile.vc b/demos/poem/makefile.vc index 7bf3925f54..814edf7ebd 100644 --- a/demos/poem/makefile.vc +++ b/demos/poem/makefile.vc @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\wxpoem.pdb del $(OBJS)\wxpoem.pdb $(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxpoem.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxpoem.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/demos/poem/makefile.wat b/demos/poem/makefile.wat index 50e4cf3e4c..f1e98a63b2 100644 --- a/demos/poem/makefile.wat +++ b/demos/poem/makefile.wat @@ -256,7 +256,7 @@ $(OBJS)\wxpoem.exe : $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res @%append $(OBJS)\wxpoem.lbc option quiet @%append $(OBJS)\wxpoem.lbc name $^@ @%append $(OBJS)\wxpoem.lbc option caseexact - @%append $(OBJS)\wxpoem.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\wxpoem.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(WXPOEM_OBJECTS)) do @%append $(OBJS)\wxpoem.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\wxpoem.lbc library %i @%append $(OBJS)\wxpoem.lbc option resource=$(OBJS)\wxpoem_wxpoem.res diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in index 5f037356f8..ff2e014e8c 100644 --- a/samples/access/Makefile.in +++ b/samples/access/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ ACCESSTEST_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__accesstest___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__accesstest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C accesstest$(EXEEXT) -@COND_PLATFORM_MAC_1@__accesstest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL accesstest$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___accesstest___os2_emxbindcmd = $(NM) accesstest$(EXEEXT) \ | if grep -q pmwin.763 ; then emxbind -ep accesstest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__accesstest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___accesstest___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__accesstest_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - accesstest$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile accesstest$(EXEEXT): $(ACCESSTEST_OBJECTS) $(__accesstest___win32rc) - $(CXX) -o $@ $(ACCESSTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__accesstest___mac_rezcmd) + $(CXX) -o $@ $(ACCESSTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__accesstest___mac_setfilecmd) $(__accesstest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ accesstest_accesstest_rc.o: $(srcdir)/accesstest.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean accesstest_bundle diff --git a/samples/access/makefile.bcc b/samples/access/makefile.bcc index bc8f11419c..6e94d8bd2d 100644 --- a/samples/access/makefile.bcc +++ b/samples/access/makefile.bcc @@ -229,7 +229,7 @@ clean: -if exist $(OBJS)\accesstest.ils del $(OBJS)\accesstest.ils $(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(ACCESSTEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\accesstest_accesstest.res | diff --git a/samples/access/makefile.gcc b/samples/access/makefile.gcc index 7fdc77b147..f026aa6ee2 100644 --- a/samples/access/makefile.gcc +++ b/samples/access/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe $(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest_rc.o - $(CXX) -o $@ $(ACCESSTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(ACCESSTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\accesstest_accesstest.o: ./accesstest.cpp $(CXX) -c -o $@ $(ACCESSTEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/access/makefile.unx b/samples/access/makefile.unx index 2b6ec9c2af..c0485686c0 100644 --- a/samples/access/makefile.unx +++ b/samples/access/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) accesstest: $(ACCESSTEST_OBJECTS) - $(CXX) -o $@ $(ACCESSTEST_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(ACCESSTEST_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) accesstest_accesstest.o: ./accesstest.cpp $(CXX) -c -o $@ $(ACCESSTEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/access/makefile.vc b/samples/access/makefile.vc index 8ee944e85a..abb27b171a 100644 --- a/samples/access/makefile.vc +++ b/samples/access/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\accesstest.pdb del $(OBJS)\accesstest.pdb $(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\accesstest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\accesstest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(ACCESSTEST_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/access/makefile.wat b/samples/access/makefile.wat index 32b98cb539..4092ba614f 100644 --- a/samples/access/makefile.wat +++ b/samples/access/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\accesstest.exe : $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.re @%append $(OBJS)\accesstest.lbc option quiet @%append $(OBJS)\accesstest.lbc name $^@ @%append $(OBJS)\accesstest.lbc option caseexact - @%append $(OBJS)\accesstest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\accesstest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(ACCESSTEST_OBJECTS)) do @%append $(OBJS)\accesstest.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\accesstest.lbc library %i @%append $(OBJS)\accesstest.lbc option resource=$(OBJS)\accesstest_accesstest.res diff --git a/samples/animate/Makefile.in b/samples/animate/Makefile.in index f869315162..b0a225db75 100644 --- a/samples/animate/Makefile.in +++ b/samples/animate/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -72,28 +71,20 @@ ANITEST_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__anitest___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__anitest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C anitest$(EXEEXT) -@COND_PLATFORM_MAC_1@__anitest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL anitest$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___anitest___os2_emxbindcmd = $(NM) anitest$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep anitest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__anitest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___anitest___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__anitest_os2_lib_res = \ @@ -134,12 +125,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - anitest$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -161,8 +146,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile anitest$(EXEEXT): $(ANITEST_OBJECTS) $(__anitest___win32rc) - $(CXX) -o $@ $(ANITEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__anitest___mac_rezcmd) + $(CXX) -o $@ $(ANITEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__anitest___mac_setfilecmd) $(__anitest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -208,7 +193,16 @@ anitest_sample_rc.o: $(srcdir)/../sample.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean anitest_bundle catalog diff --git a/samples/animate/makefile.bcc b/samples/animate/makefile.bcc index 05a32375f3..2d4613c7d6 100644 --- a/samples/animate/makefile.bcc +++ b/samples/animate/makefile.bcc @@ -233,7 +233,7 @@ clean: -if exist $(OBJS)\anitest.ils del $(OBJS)\anitest.ils $(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(ANITEST_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\anitest_sample.res | diff --git a/samples/animate/makefile.gcc b/samples/animate/makefile.gcc index 801a4e5752..de729168e3 100644 --- a/samples/animate/makefile.gcc +++ b/samples/animate/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: -if exist $(OBJS)\anitest.exe del $(OBJS)\anitest.exe $(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_sample_rc.o - $(CXX) -o $@ $(ANITEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(ANITEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 catalog: if not exist $(OBJS) mkdir $(OBJS) diff --git a/samples/animate/makefile.unx b/samples/animate/makefile.unx index 63752a4eee..94264718bf 100644 --- a/samples/animate/makefile.unx +++ b/samples/animate/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) anitest: $(ANITEST_OBJECTS) - $(CXX) -o $@ $(ANITEST_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` + $(CXX) -o $@ $(ANITEST_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` $(LDFLAGS) anitest_anitest.o: ./anitest.cpp $(CXX) -c -o $@ $(ANITEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/animate/makefile.vc b/samples/animate/makefile.vc index 35c4fb1349..ec04d4bdb2 100644 --- a/samples/animate/makefile.vc +++ b/samples/animate/makefile.vc @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\anitest.pdb del $(OBJS)\anitest.pdb $(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\anitest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\anitest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(ANITEST_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/animate/makefile.wat b/samples/animate/makefile.wat index 9c0176489f..a8e8db8a5c 100644 --- a/samples/animate/makefile.wat +++ b/samples/animate/makefile.wat @@ -256,7 +256,7 @@ $(OBJS)\anitest.exe : $(ANITEST_OBJECTS) $(OBJS)\anitest_sample.res @%append $(OBJS)\anitest.lbc option quiet @%append $(OBJS)\anitest.lbc name $^@ @%append $(OBJS)\anitest.lbc option caseexact - @%append $(OBJS)\anitest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\anitest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(ANITEST_OBJECTS)) do @%append $(OBJS)\anitest.lbc file %i @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\anitest.lbc library %i @%append $(OBJS)\anitest.lbc option resource=$(OBJS)\anitest_sample.res diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in index 18fbf62caa..25adcf50ab 100644 --- a/samples/artprov/Makefile.in +++ b/samples/artprov/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -71,28 +70,20 @@ ARTTEST_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__arttest___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__arttest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C arttest$(EXEEXT) -@COND_PLATFORM_MAC_1@__arttest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL arttest$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___arttest___os2_emxbindcmd = $(NM) arttest$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep arttest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__arttest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___arttest___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__arttest_os2_lib_res = \ @@ -130,12 +121,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - arttest$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -157,8 +142,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile arttest$(EXEEXT): $(ARTTEST_OBJECTS) $(__arttest___win32rc) - $(CXX) -o $@ $(ARTTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__arttest___mac_rezcmd) + $(CXX) -o $@ $(ARTTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__arttest___mac_setfilecmd) $(__arttest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -195,7 +180,16 @@ arttest_arttest_rc.o: $(srcdir)/arttest.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean arttest_bundle diff --git a/samples/artprov/makefile.bcc b/samples/artprov/makefile.bcc index b2d84e5a5c..acebdf4389 100644 --- a/samples/artprov/makefile.bcc +++ b/samples/artprov/makefile.bcc @@ -230,7 +230,7 @@ clean: -if exist $(OBJS)\arttest.ils del $(OBJS)\arttest.ils $(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(ARTTEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\arttest_arttest.res | diff --git a/samples/artprov/makefile.gcc b/samples/artprov/makefile.gcc index 0c15a18571..122f46b03f 100644 --- a/samples/artprov/makefile.gcc +++ b/samples/artprov/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -225,7 +225,7 @@ clean: -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe $(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest_rc.o - $(CXX) -o $@ $(ARTTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(ARTTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\arttest_arttest.o: ./arttest.cpp $(CXX) -c -o $@ $(ARTTEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/artprov/makefile.unx b/samples/artprov/makefile.unx index 14e1281c9b..f0df5d2aca 100644 --- a/samples/artprov/makefile.unx +++ b/samples/artprov/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -99,7 +99,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) arttest: $(ARTTEST_OBJECTS) - $(CXX) -o $@ $(ARTTEST_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(ARTTEST_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) arttest_arttest.o: ./arttest.cpp $(CXX) -c -o $@ $(ARTTEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/artprov/makefile.vc b/samples/artprov/makefile.vc index 5d82ee52ac..e17788ed61 100644 --- a/samples/artprov/makefile.vc +++ b/samples/artprov/makefile.vc @@ -306,7 +306,7 @@ clean: -if exist $(OBJS)\arttest.pdb del $(OBJS)\arttest.pdb $(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\arttest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\arttest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(ARTTEST_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/artprov/makefile.wat b/samples/artprov/makefile.wat index bab680bcd7..0b7025d9a5 100644 --- a/samples/artprov/makefile.wat +++ b/samples/artprov/makefile.wat @@ -252,7 +252,7 @@ $(OBJS)\arttest.exe : $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res @%append $(OBJS)\arttest.lbc option quiet @%append $(OBJS)\arttest.lbc name $^@ @%append $(OBJS)\arttest.lbc option caseexact - @%append $(OBJS)\arttest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\arttest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(ARTTEST_OBJECTS)) do @%append $(OBJS)\arttest.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\arttest.lbc library %i @%append $(OBJS)\arttest.lbc option resource=$(OBJS)\arttest_arttest.res diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in index e67d7489b7..56d4bbfc53 100644 --- a/samples/aui/Makefile.in +++ b/samples/aui/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -74,28 +73,20 @@ AUIDEMO_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__auidemo___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__auidemo___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C auidemo$(EXEEXT) -@COND_PLATFORM_MAC_1@__auidemo___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL auidemo$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___auidemo___os2_emxbindcmd = $(NM) auidemo$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep auidemo$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__auidemo___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___auidemo___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__auidemo___win32rc = auidemo_sample_rc.o @@ -145,12 +136,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - auidemo$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -172,8 +157,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile auidemo$(EXEEXT): $(AUIDEMO_OBJECTS) $(__auidemo___win32rc) - $(CXX) -o $@ $(AUIDEMO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__auidemo___mac_rezcmd) + $(CXX) -o $@ $(AUIDEMO_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__auidemo___mac_setfilecmd) $(__auidemo___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -207,7 +192,16 @@ auidemo_auidemo.o: $(srcdir)/auidemo.cpp $(CXXC) -c -o $@ $(AUIDEMO_CXXFLAGS) $(srcdir)/auidemo.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean auidemo_bundle diff --git a/samples/aui/makefile.bcc b/samples/aui/makefile.bcc index fc705b3a2b..e779edc56e 100644 --- a/samples/aui/makefile.bcc +++ b/samples/aui/makefile.bcc @@ -245,7 +245,7 @@ clean: -if exist $(OBJS)\auidemo.ils del $(OBJS)\auidemo.ils $(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(AUIDEMO_OBJECTS),$@,, $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\auidemo_sample.res | diff --git a/samples/aui/makefile.gcc b/samples/aui/makefile.gcc index 70227fd1e1..256959b374 100644 --- a/samples/aui/makefile.gcc +++ b/samples/aui/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -240,7 +240,7 @@ clean: -if exist $(OBJS)\auidemo.exe del $(OBJS)\auidemo.exe $(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample_rc.o - $(CXX) -o $@ $(AUIDEMO_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(AUIDEMO_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\auidemo_sample_rc.o: ./../../samples/sample.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH diff --git a/samples/aui/makefile.unx b/samples/aui/makefile.unx index 3d8cede757..8ffcd26433 100644 --- a/samples/aui/makefile.unx +++ b/samples/aui/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) auidemo: $(AUIDEMO_OBJECTS) - $(CXX) -o $@ $(AUIDEMO_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs aui,html,adv,core,xml,base` + $(CXX) -o $@ $(AUIDEMO_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs aui,html,adv,core,xml,base` $(LDFLAGS) auidemo_auidemo.o: ./auidemo.cpp $(CXX) -c -o $@ $(AUIDEMO_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/aui/makefile.vc b/samples/aui/makefile.vc index 72371e0c05..f3084e4f73 100644 --- a/samples/aui/makefile.vc +++ b/samples/aui/makefile.vc @@ -321,7 +321,7 @@ clean: -if exist $(OBJS)\auidemo.pdb del $(OBJS)\auidemo.pdb $(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\auidemo.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\auidemo.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(AUIDEMO_OBJECTS) $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/aui/makefile.wat b/samples/aui/makefile.wat index 3d0a7c36bd..dfe5721ad2 100644 --- a/samples/aui/makefile.wat +++ b/samples/aui/makefile.wat @@ -271,7 +271,7 @@ $(OBJS)\auidemo.exe : $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res @%append $(OBJS)\auidemo.lbc option quiet @%append $(OBJS)\auidemo.lbc name $^@ @%append $(OBJS)\auidemo.lbc option caseexact - @%append $(OBJS)\auidemo.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\auidemo.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(AUIDEMO_OBJECTS)) do @%append $(OBJS)\auidemo.lbc file %i @for %i in ( $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\auidemo.lbc library %i @%append $(OBJS)\auidemo.lbc option resource=$(OBJS)\auidemo_sample.res diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in index fda0736f50..fa4958681d 100644 --- a/samples/calendar/Makefile.in +++ b/samples/calendar/Makefile.in @@ -146,7 +146,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile calendar$(EXEEXT): $(CALENDAR_OBJECTS) $(__calendar___win32rc) - $(CXX) -o $@ $(CALENDAR_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) + $(CXX) -o $@ $(CALENDAR_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) $(__calendar___mac_setfilecmd) $(__calendar___os2_emxbindcmd) @@ -191,6 +191,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ $(srcdir)/include/wx/stc/stc.h # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean calendar_bundle diff --git a/samples/calendar/makefile.bcc b/samples/calendar/makefile.bcc index c0db2c2653..dbce2cdc0a 100644 --- a/samples/calendar/makefile.bcc +++ b/samples/calendar/makefile.bcc @@ -233,7 +233,7 @@ clean: -if exist $(OBJS)\calendar.ils del $(OBJS)\calendar.ils $(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(CALENDAR_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\calendar_calendar.res | diff --git a/samples/calendar/makefile.gcc b/samples/calendar/makefile.gcc index 8139f5daff..6123839a82 100644 --- a/samples/calendar/makefile.gcc +++ b/samples/calendar/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe $(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar_rc.o - $(CXX) -o $@ $(CALENDAR_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(CALENDAR_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\calendar_calendar.o: ./calendar.cpp $(CXX) -c -o $@ $(CALENDAR_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/calendar/makefile.unx b/samples/calendar/makefile.unx index 28957564c8..87a3015b2c 100644 --- a/samples/calendar/makefile.unx +++ b/samples/calendar/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) calendar: $(CALENDAR_OBJECTS) - $(CXX) -o $@ $(CALENDAR_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` + $(CXX) -o $@ $(CALENDAR_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` $(LDFLAGS) calendar_calendar.o: ./calendar.cpp $(CXX) -c -o $@ $(CALENDAR_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/calendar/makefile.vc b/samples/calendar/makefile.vc index 1524e991c4..5855659f8b 100644 --- a/samples/calendar/makefile.vc +++ b/samples/calendar/makefile.vc @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\calendar.pdb del $(OBJS)\calendar.pdb $(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\calendar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\calendar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(CALENDAR_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/calendar/makefile.wat b/samples/calendar/makefile.wat index 3c25cb8920..08a8d7ea75 100644 --- a/samples/calendar/makefile.wat +++ b/samples/calendar/makefile.wat @@ -256,7 +256,7 @@ $(OBJS)\calendar.exe : $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res @%append $(OBJS)\calendar.lbc option quiet @%append $(OBJS)\calendar.lbc name $^@ @%append $(OBJS)\calendar.lbc option caseexact - @%append $(OBJS)\calendar.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\calendar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(CALENDAR_OBJECTS)) do @%append $(OBJS)\calendar.lbc file %i @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\calendar.lbc library %i @%append $(OBJS)\calendar.lbc option resource=$(OBJS)\calendar_calendar.res diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in index f41d50f1e9..e0e06dc867 100644 --- a/samples/caret/Makefile.in +++ b/samples/caret/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ CARET_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__caret___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__caret___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C caret$(EXEEXT) -@COND_PLATFORM_MAC_1@__caret___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL caret$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___caret___os2_emxbindcmd = $(NM) caret$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep caret$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__caret___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___caret___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__caret_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - caret$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile caret$(EXEEXT): $(CARET_OBJECTS) $(__caret___win32rc) - $(CXX) -o $@ $(CARET_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__caret___mac_rezcmd) + $(CXX) -o $@ $(CARET_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__caret___mac_setfilecmd) $(__caret___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ caret_caret_rc.o: $(srcdir)/caret.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean caret_bundle diff --git a/samples/caret/makefile.bcc b/samples/caret/makefile.bcc index 1f3ebe7eb7..344a9faec1 100644 --- a/samples/caret/makefile.bcc +++ b/samples/caret/makefile.bcc @@ -229,7 +229,7 @@ clean: -if exist $(OBJS)\caret.ils del $(OBJS)\caret.ils $(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_caret.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(CARET_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\caret_caret.res | diff --git a/samples/caret/makefile.gcc b/samples/caret/makefile.gcc index e7970a9a29..d281e61b38 100644 --- a/samples/caret/makefile.gcc +++ b/samples/caret/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe $(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_caret_rc.o - $(CXX) -o $@ $(CARET_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(CARET_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\caret_caret.o: ./caret.cpp $(CXX) -c -o $@ $(CARET_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/caret/makefile.unx b/samples/caret/makefile.unx index 66c5b6542c..2392220f01 100644 --- a/samples/caret/makefile.unx +++ b/samples/caret/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) caret: $(CARET_OBJECTS) - $(CXX) -o $@ $(CARET_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(CARET_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) caret_caret.o: ./caret.cpp $(CXX) -c -o $@ $(CARET_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/caret/makefile.vc b/samples/caret/makefile.vc index dc4f993a2a..8aa826e36b 100644 --- a/samples/caret/makefile.vc +++ b/samples/caret/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\caret.pdb del $(OBJS)\caret.pdb $(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_caret.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\caret.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\caret.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(CARET_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/caret/makefile.wat b/samples/caret/makefile.wat index 441fa4bec5..b7bcf23ce6 100644 --- a/samples/caret/makefile.wat +++ b/samples/caret/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\caret.exe : $(CARET_OBJECTS) $(OBJS)\caret_caret.res @%append $(OBJS)\caret.lbc option quiet @%append $(OBJS)\caret.lbc name $^@ @%append $(OBJS)\caret.lbc option caseexact - @%append $(OBJS)\caret.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\caret.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(CARET_OBJECTS)) do @%append $(OBJS)\caret.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\caret.lbc library %i @%append $(OBJS)\caret.lbc option resource=$(OBJS)\caret_caret.res diff --git a/samples/collpane/Makefile.in b/samples/collpane/Makefile.in index 7b80f5cd52..7f02467222 100644 --- a/samples/collpane/Makefile.in +++ b/samples/collpane/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -72,28 +71,20 @@ COLLPANE_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__collpane___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__collpane___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C collpane$(EXEEXT) -@COND_PLATFORM_MAC_1@__collpane___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL collpane$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___collpane___os2_emxbindcmd = $(NM) collpane$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep collpane$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__collpane___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___collpane___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__collpane_os2_lib_res = \ @@ -134,12 +125,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - collpane$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -161,8 +146,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile collpane$(EXEEXT): $(COLLPANE_OBJECTS) $(__collpane___win32rc) - $(CXX) -o $@ $(COLLPANE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__collpane___mac_rezcmd) + $(CXX) -o $@ $(COLLPANE_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__collpane___mac_setfilecmd) $(__collpane___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -196,7 +181,16 @@ collpane_sample_rc.o: $(srcdir)/../sample.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean collpane_bundle diff --git a/samples/collpane/makefile.bcc b/samples/collpane/makefile.bcc index 159bd58368..053abed77f 100644 --- a/samples/collpane/makefile.bcc +++ b/samples/collpane/makefile.bcc @@ -233,7 +233,7 @@ clean: -if exist $(OBJS)\collpane.ils del $(OBJS)\collpane.ils $(OBJS)\collpane.exe: $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(COLLPANE_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\collpane_sample.res | diff --git a/samples/collpane/makefile.gcc b/samples/collpane/makefile.gcc index 328ef9d828..be47573391 100644 --- a/samples/collpane/makefile.gcc +++ b/samples/collpane/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: -if exist $(OBJS)\collpane.exe del $(OBJS)\collpane.exe $(OBJS)\collpane.exe: $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample_rc.o - $(CXX) -o $@ $(COLLPANE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(COLLPANE_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\collpane_collpane.o: ./collpane.cpp $(CXX) -c -o $@ $(COLLPANE_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/collpane/makefile.unx b/samples/collpane/makefile.unx index a660d53781..b172b8d79e 100644 --- a/samples/collpane/makefile.unx +++ b/samples/collpane/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) collpane: $(COLLPANE_OBJECTS) - $(CXX) -o $@ $(COLLPANE_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` + $(CXX) -o $@ $(COLLPANE_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` $(LDFLAGS) collpane_collpane.o: ./collpane.cpp $(CXX) -c -o $@ $(COLLPANE_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/collpane/makefile.vc b/samples/collpane/makefile.vc index 9ad440d5d7..98530e40f6 100644 --- a/samples/collpane/makefile.vc +++ b/samples/collpane/makefile.vc @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\collpane.pdb del $(OBJS)\collpane.pdb $(OBJS)\collpane.exe: $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\collpane.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\collpane.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(COLLPANE_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/collpane/makefile.wat b/samples/collpane/makefile.wat index e234b2ece2..8fb87dd13c 100644 --- a/samples/collpane/makefile.wat +++ b/samples/collpane/makefile.wat @@ -256,7 +256,7 @@ $(OBJS)\collpane.exe : $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample.res @%append $(OBJS)\collpane.lbc option quiet @%append $(OBJS)\collpane.lbc name $^@ @%append $(OBJS)\collpane.lbc option caseexact - @%append $(OBJS)\collpane.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\collpane.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(COLLPANE_OBJECTS)) do @%append $(OBJS)\collpane.lbc file %i @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\collpane.lbc library %i @%append $(OBJS)\collpane.lbc option resource=$(OBJS)\collpane_sample.res diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in index c5ee279ccb..36215bb6f3 100644 --- a/samples/combo/Makefile.in +++ b/samples/combo/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -72,28 +71,20 @@ COMBO_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__combo___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__combo___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C combo$(EXEEXT) -@COND_PLATFORM_MAC_1@__combo___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL combo$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___combo___os2_emxbindcmd = $(NM) combo$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep combo$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__combo___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___combo___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__combo___win32rc = combo_sample_rc.o @@ -134,12 +125,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - combo$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -161,8 +146,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile combo$(EXEEXT): $(COMBO_OBJECTS) $(__combo___win32rc) - $(CXX) -o $@ $(COMBO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__combo___mac_rezcmd) + $(CXX) -o $@ $(COMBO_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__combo___mac_setfilecmd) $(__combo___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -208,7 +193,16 @@ combo_combo.o: $(srcdir)/combo.cpp $(CXXC) -c -o $@ $(COMBO_CXXFLAGS) $(srcdir)/combo.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean combo_bundle data diff --git a/samples/combo/makefile.bcc b/samples/combo/makefile.bcc index 989b86cf21..87d635464a 100644 --- a/samples/combo/makefile.bcc +++ b/samples/combo/makefile.bcc @@ -233,7 +233,7 @@ clean: -if exist $(OBJS)\combo.ils del $(OBJS)\combo.ils $(OBJS)\combo.exe: $(COMBO_OBJECTS) $(OBJS)\combo_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(COMBO_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\combo_sample.res | diff --git a/samples/combo/makefile.gcc b/samples/combo/makefile.gcc index b24a5a06ce..c8cfa516dc 100644 --- a/samples/combo/makefile.gcc +++ b/samples/combo/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: -if exist $(OBJS)\combo.exe del $(OBJS)\combo.exe $(OBJS)\combo.exe: $(COMBO_OBJECTS) $(OBJS)\combo_sample_rc.o - $(CXX) -o $@ $(COMBO_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(COMBO_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/samples/combo/makefile.unx b/samples/combo/makefile.unx index a7a7a09043..719627ad93 100644 --- a/samples/combo/makefile.unx +++ b/samples/combo/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) combo: $(COMBO_OBJECTS) - $(CXX) -o $@ $(COMBO_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` + $(CXX) -o $@ $(COMBO_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` $(LDFLAGS) combo_combo.o: ./combo.cpp $(CXX) -c -o $@ $(COMBO_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/combo/makefile.vc b/samples/combo/makefile.vc index 3b62b94875..3d52db3391 100644 --- a/samples/combo/makefile.vc +++ b/samples/combo/makefile.vc @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\combo.pdb del $(OBJS)\combo.pdb $(OBJS)\combo.exe: $(COMBO_OBJECTS) $(OBJS)\combo_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\combo.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\combo.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(COMBO_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/combo/makefile.wat b/samples/combo/makefile.wat index 84c8a868fa..570d1a661a 100644 --- a/samples/combo/makefile.wat +++ b/samples/combo/makefile.wat @@ -256,7 +256,7 @@ $(OBJS)\combo.exe : $(COMBO_OBJECTS) $(OBJS)\combo_sample.res @%append $(OBJS)\combo.lbc option quiet @%append $(OBJS)\combo.lbc name $^@ @%append $(OBJS)\combo.lbc option caseexact - @%append $(OBJS)\combo.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\combo.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(COMBO_OBJECTS)) do @%append $(OBJS)\combo.lbc file %i @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\combo.lbc library %i @%append $(OBJS)\combo.lbc option resource=$(OBJS)\combo_sample.res diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in index 38f1f8ffd6..2c99b6f159 100644 --- a/samples/config/Makefile.in +++ b/samples/config/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ CONFTEST_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__conftest___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__conftest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C conftest$(EXEEXT) -@COND_PLATFORM_MAC_1@__conftest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL conftest$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___conftest___os2_emxbindcmd = $(NM) conftest$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep conftest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__conftest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___conftest___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__conftest_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - conftest$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc) - $(CXX) -o $@ $(CONFTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__conftest___mac_rezcmd) + $(CXX) -o $@ $(CONFTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__conftest___mac_setfilecmd) $(__conftest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ conftest_conftest_rc.o: $(srcdir)/conftest.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean conftest_bundle diff --git a/samples/config/makefile.bcc b/samples/config/makefile.bcc index 203d1cbb4b..c2da20f89e 100644 --- a/samples/config/makefile.bcc +++ b/samples/config/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(CONFTEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\conftest_conftest.res | diff --git a/samples/config/makefile.gcc b/samples/config/makefile.gcc index 8b250ca39e..b3c8359390 100644 --- a/samples/config/makefile.gcc +++ b/samples/config/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe $(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest_rc.o - $(CXX) -o $@ $(CONFTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(CONFTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\conftest_conftest.o: ./conftest.cpp $(CXX) -c -o $@ $(CONFTEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/config/makefile.unx b/samples/config/makefile.unx index d905cdbf8a..ada4fe8348 100644 --- a/samples/config/makefile.unx +++ b/samples/config/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) conftest: $(CONFTEST_OBJECTS) - $(CXX) -o $@ $(CONFTEST_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(CONFTEST_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) conftest_conftest.o: ./conftest.cpp $(CXX) -c -o $@ $(CONFTEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/config/makefile.vc b/samples/config/makefile.vc index 16d790537f..fb3cea96f8 100644 --- a/samples/config/makefile.vc +++ b/samples/config/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\conftest.pdb del $(OBJS)\conftest.pdb $(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\conftest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\conftest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(CONFTEST_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/config/makefile.wat b/samples/config/makefile.wat index 588e1b9872..2c7b0eb504 100644 --- a/samples/config/makefile.wat +++ b/samples/config/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\conftest.exe : $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res @%append $(OBJS)\conftest.lbc option quiet @%append $(OBJS)\conftest.lbc name $^@ @%append $(OBJS)\conftest.lbc option caseexact - @%append $(OBJS)\conftest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\conftest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(CONFTEST_OBJECTS)) do @%append $(OBJS)\conftest.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\conftest.lbc library %i @%append $(OBJS)\conftest.lbc option resource=$(OBJS)\conftest_conftest.res diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in index 16d2b10a21..dbe6dfa1c0 100644 --- a/samples/console/Makefile.in +++ b/samples/console/Makefile.in @@ -102,7 +102,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile console$(EXEEXT): $(CONSOLE_OBJECTS) - $(CXX) -o $@ $(CONSOLE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) + $(CXX) -o $@ $(CONSOLE_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) $(__console___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) @@ -123,7 +123,16 @@ console_console.o: $(srcdir)/console.cpp $(CXXC) -c -o $@ $(CONSOLE_CXXFLAGS) $(srcdir)/console.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean data diff --git a/samples/console/makefile.bcc b/samples/console/makefile.bcc index 47ef0fc6fb..544574e9fe 100644 --- a/samples/console/makefile.bcc +++ b/samples/console/makefile.bcc @@ -187,7 +187,7 @@ clean: -if exist $(OBJS)\console.ils del $(OBJS)\console.ils $(OBJS)\console.exe: $(CONSOLE_OBJECTS) - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&| c0x32.obj $(CONSOLE_OBJECTS),$@,, $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, | diff --git a/samples/console/makefile.gcc b/samples/console/makefile.gcc index 48bd4be73e..bd49871e0f 100644 --- a/samples/console/makefile.gcc +++ b/samples/console/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -179,7 +179,7 @@ clean: -if exist $(OBJS)\console.exe del $(OBJS)\console.exe $(OBJS)\console.exe: $(CONSOLE_OBJECTS) - $(CXX) -o $@ $(CONSOLE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(CONSOLE_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/samples/console/makefile.unx b/samples/console/makefile.unx index aa5d51c807..c1be843c17 100644 --- a/samples/console/makefile.unx +++ b/samples/console/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) console: $(CONSOLE_OBJECTS) - $(CXX) -o $@ $(CONSOLE_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs net,base` + $(CXX) -o $@ $(CONSOLE_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs net,base` $(LDFLAGS) console_console.o: ./console.cpp $(CXX) -c -o $@ $(CONSOLE_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/console/makefile.vc b/samples/console/makefile.vc index ffc6430bac..f352249ea8 100644 --- a/samples/console/makefile.vc +++ b/samples/console/makefile.vc @@ -244,7 +244,7 @@ clean: -if exist $(OBJS)\console.pdb del $(OBJS)\console.pdb $(OBJS)\console.exe: $(CONSOLE_OBJECTS) - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\console.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\console.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< $(CONSOLE_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/console/makefile.wat b/samples/console/makefile.wat index 4102490c14..2dd1515b91 100644 --- a/samples/console/makefile.wat +++ b/samples/console/makefile.wat @@ -238,7 +238,7 @@ $(OBJS)\console.exe : $(CONSOLE_OBJECTS) @%append $(OBJS)\console.lbc option quiet @%append $(OBJS)\console.lbc name $^@ @%append $(OBJS)\console.lbc option caseexact - @%append $(OBJS)\console.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' + @%append $(OBJS)\console.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) @for %i in ($(CONSOLE_OBJECTS)) do @%append $(OBJS)\console.lbc file %i @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\console.lbc library %i @%append $(OBJS)\console.lbc diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in index 6361500d70..71268ebd09 100644 --- a/samples/controls/Makefile.in +++ b/samples/controls/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ CONTROLS_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__controls___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__controls___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C controls$(EXEEXT) -@COND_PLATFORM_MAC_1@__controls___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL controls$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___controls___os2_emxbindcmd = $(NM) controls$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep controls$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__controls___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___controls___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__controls_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - controls$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile controls$(EXEEXT): $(CONTROLS_OBJECTS) $(__controls___win32rc) - $(CXX) -o $@ $(CONTROLS_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__controls___mac_rezcmd) + $(CXX) -o $@ $(CONTROLS_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__controls___mac_setfilecmd) $(__controls___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -203,7 +188,16 @@ controls_controls_rc.o: $(srcdir)/controls.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean controls_bundle data diff --git a/samples/controls/makefile.bcc b/samples/controls/makefile.bcc index ff56d2c3f6..6e9827f6c1 100644 --- a/samples/controls/makefile.bcc +++ b/samples/controls/makefile.bcc @@ -229,7 +229,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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\controls_controls.res | diff --git a/samples/controls/makefile.gcc b/samples/controls/makefile.gcc index 694c1b9b84..198dd8d4e8 100644 --- a/samples/controls/makefile.gcc +++ b/samples/controls/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe $(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls_rc.o - $(CXX) -o $@ $(CONTROLS_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(CONTROLS_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/samples/controls/makefile.unx b/samples/controls/makefile.unx index ae97864514..5436f7fb35 100644 --- a/samples/controls/makefile.unx +++ b/samples/controls/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) controls: $(CONTROLS_OBJECTS) - $(CXX) -o $@ $(CONTROLS_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(CONTROLS_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) controls_controls.o: ./controls.cpp $(CXX) -c -o $@ $(CONTROLS_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/controls/makefile.vc b/samples/controls/makefile.vc index 34f009a84e..e757906a23 100644 --- a/samples/controls/makefile.vc +++ b/samples/controls/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\controls.pdb del $(OBJS)\controls.pdb $(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\controls.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\controls.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(CONTROLS_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/controls/makefile.wat b/samples/controls/makefile.wat index 528fcafaa4..908910946c 100644 --- a/samples/controls/makefile.wat +++ b/samples/controls/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\controls.exe : $(CONTROLS_OBJECTS) $(OBJS)\controls_controls.res @%append $(OBJS)\controls.lbc option quiet @%append $(OBJS)\controls.lbc name $^@ @%append $(OBJS)\controls.lbc option caseexact - @%append $(OBJS)\controls.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\controls.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(CONTROLS_OBJECTS)) do @%append $(OBJS)\controls.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\controls.lbc library %i @%append $(OBJS)\controls.lbc option resource=$(OBJS)\controls_controls.res diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in index c6b8ad157a..5509311b29 100644 --- a/samples/dataview/Makefile.in +++ b/samples/dataview/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -72,28 +71,20 @@ DATAVIEW_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__dataview___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__dataview___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C dataview$(EXEEXT) -@COND_PLATFORM_MAC_1@__dataview___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL dataview$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___dataview___os2_emxbindcmd = $(NM) dataview$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep dataview$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__dataview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dataview___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__dataview_os2_lib_res = \ @@ -134,12 +125,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - dataview$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -161,8 +146,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile dataview$(EXEEXT): $(DATAVIEW_OBJECTS) $(__dataview___win32rc) - $(CXX) -o $@ $(DATAVIEW_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__dataview___mac_rezcmd) + $(CXX) -o $@ $(DATAVIEW_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__dataview___mac_setfilecmd) $(__dataview___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -196,7 +181,16 @@ dataview_sample_rc.o: $(srcdir)/../sample.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean dataview_bundle diff --git a/samples/dataview/makefile.bcc b/samples/dataview/makefile.bcc index e1041dbe84..99b0363cbf 100644 --- a/samples/dataview/makefile.bcc +++ b/samples/dataview/makefile.bcc @@ -233,7 +233,7 @@ clean: -if exist $(OBJS)\dataview.ils del $(OBJS)\dataview.ils $(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(DATAVIEW_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dataview_sample.res | diff --git a/samples/dataview/makefile.gcc b/samples/dataview/makefile.gcc index b4166204dd..20e7068ab7 100644 --- a/samples/dataview/makefile.gcc +++ b/samples/dataview/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: -if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe $(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample_rc.o - $(CXX) -o $@ $(DATAVIEW_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(DATAVIEW_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\dataview_dataview.o: ./dataview.cpp $(CXX) -c -o $@ $(DATAVIEW_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/dataview/makefile.unx b/samples/dataview/makefile.unx index 33380123f0..d6b8e2356f 100644 --- a/samples/dataview/makefile.unx +++ b/samples/dataview/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) dataview: $(DATAVIEW_OBJECTS) - $(CXX) -o $@ $(DATAVIEW_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` + $(CXX) -o $@ $(DATAVIEW_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` $(LDFLAGS) dataview_dataview.o: ./dataview.cpp $(CXX) -c -o $@ $(DATAVIEW_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/dataview/makefile.vc b/samples/dataview/makefile.vc index 21a0c51cbd..b19942157f 100644 --- a/samples/dataview/makefile.vc +++ b/samples/dataview/makefile.vc @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\dataview.pdb del $(OBJS)\dataview.pdb $(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\dataview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dataview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(DATAVIEW_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/dataview/makefile.wat b/samples/dataview/makefile.wat index ebcad92185..02934e55ea 100644 --- a/samples/dataview/makefile.wat +++ b/samples/dataview/makefile.wat @@ -256,7 +256,7 @@ $(OBJS)\dataview.exe : $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res @%append $(OBJS)\dataview.lbc option quiet @%append $(OBJS)\dataview.lbc name $^@ @%append $(OBJS)\dataview.lbc option caseexact - @%append $(OBJS)\dataview.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\dataview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(DATAVIEW_OBJECTS)) do @%append $(OBJS)\dataview.lbc file %i @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\dataview.lbc library %i @%append $(OBJS)\dataview.lbc option resource=$(OBJS)\dataview_sample.res diff --git a/samples/debugrpt/Makefile.in b/samples/debugrpt/Makefile.in index d5ee246c8e..89dcc68694 100644 --- a/samples/debugrpt/Makefile.in +++ b/samples/debugrpt/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -71,28 +70,20 @@ DEBUGRPT_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__debugrpt___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__debugrpt___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C debugrpt$(EXEEXT) -@COND_PLATFORM_MAC_1@__debugrpt___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL debugrpt$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___debugrpt___os2_emxbindcmd = $(NM) debugrpt$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep debugrpt$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__debugrpt___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___debugrpt___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__debugrpt___win32rc = debugrpt_sample_rc.o @@ -136,12 +127,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - debugrpt$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -163,8 +148,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile debugrpt$(EXEEXT): $(DEBUGRPT_OBJECTS) $(__debugrpt___win32rc) - $(CXX) -o $@ $(DEBUGRPT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__debugrpt___mac_rezcmd) + $(CXX) -o $@ $(DEBUGRPT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__debugrpt___mac_setfilecmd) $(__debugrpt___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -198,7 +183,16 @@ debugrpt_debugrpt.o: $(srcdir)/debugrpt.cpp $(CXXC) -c -o $@ $(DEBUGRPT_CXXFLAGS) $(srcdir)/debugrpt.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean debugrpt_bundle diff --git a/samples/debugrpt/makefile.bcc b/samples/debugrpt/makefile.bcc index 75653e1962..93eae05fca 100644 --- a/samples/debugrpt/makefile.bcc +++ b/samples/debugrpt/makefile.bcc @@ -237,7 +237,7 @@ clean: -if exist $(OBJS)\debugrpt.ils del $(OBJS)\debugrpt.ils $(OBJS)\debugrpt.exe: $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(DEBUGRPT_OBJECTS),$@,, $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\debugrpt_sample.res | diff --git a/samples/debugrpt/makefile.gcc b/samples/debugrpt/makefile.gcc index 42b4a7363d..c7a8da14e1 100644 --- a/samples/debugrpt/makefile.gcc +++ b/samples/debugrpt/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -232,7 +232,7 @@ clean: -if exist $(OBJS)\debugrpt.exe del $(OBJS)\debugrpt.exe $(OBJS)\debugrpt.exe: $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample_rc.o - $(CXX) -o $@ $(DEBUGRPT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(DEBUGRPT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\debugrpt_sample_rc.o: ./../../samples/sample.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH diff --git a/samples/debugrpt/makefile.unx b/samples/debugrpt/makefile.unx index 21adc05fec..825b9d4201 100644 --- a/samples/debugrpt/makefile.unx +++ b/samples/debugrpt/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) debugrpt: $(DEBUGRPT_OBJECTS) - $(CXX) -o $@ $(DEBUGRPT_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs qa,core,base` + $(CXX) -o $@ $(DEBUGRPT_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs qa,core,base` $(LDFLAGS) debugrpt_debugrpt.o: ./debugrpt.cpp $(CXX) -c -o $@ $(DEBUGRPT_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/debugrpt/makefile.vc b/samples/debugrpt/makefile.vc index dfa50f5a9d..2a80f3461e 100644 --- a/samples/debugrpt/makefile.vc +++ b/samples/debugrpt/makefile.vc @@ -313,7 +313,7 @@ clean: -if exist $(OBJS)\debugrpt.pdb del $(OBJS)\debugrpt.pdb $(OBJS)\debugrpt.exe: $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\debugrpt.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\debugrpt.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(DEBUGRPT_OBJECTS) $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/debugrpt/makefile.wat b/samples/debugrpt/makefile.wat index d129d9b10f..2807b07a1b 100644 --- a/samples/debugrpt/makefile.wat +++ b/samples/debugrpt/makefile.wat @@ -261,7 +261,7 @@ $(OBJS)\debugrpt.exe : $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample.res @%append $(OBJS)\debugrpt.lbc option quiet @%append $(OBJS)\debugrpt.lbc name $^@ @%append $(OBJS)\debugrpt.lbc option caseexact - @%append $(OBJS)\debugrpt.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\debugrpt.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(DEBUGRPT_OBJECTS)) do @%append $(OBJS)\debugrpt.lbc file %i @for %i in ( $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\debugrpt.lbc library %i @%append $(OBJS)\debugrpt.lbc option resource=$(OBJS)\debugrpt_sample.res diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in index 3c4543862a..5e41f13cbb 100644 --- a/samples/dialogs/Makefile.in +++ b/samples/dialogs/Makefile.in @@ -157,7 +157,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile dialogs$(EXEEXT): $(DIALOGS_OBJECTS) $(__dialogs___win32rc) - $(CXX) -o $@ $(DIALOGS_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) + $(CXX) -o $@ $(DIALOGS_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) $(__dialogs___mac_setfilecmd) $(__dialogs___os2_emxbindcmd) @@ -244,6 +244,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ $(srcdir)/include/wx/stc/stc.h # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean dialogs_bundle data diff --git a/samples/dialogs/makefile.bcc b/samples/dialogs/makefile.bcc index ae3850dca1..b4e0aa5858 100644 --- a/samples/dialogs/makefile.bcc +++ b/samples/dialogs/makefile.bcc @@ -241,7 +241,7 @@ clean: -if exist $(OBJS)\dialogs.ils del $(OBJS)\dialogs.ils $(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(DIALOGS_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dialogs_dialogs.res | diff --git a/samples/dialogs/makefile.gcc b/samples/dialogs/makefile.gcc index a4e50e423b..915ec47924 100644 --- a/samples/dialogs/makefile.gcc +++ b/samples/dialogs/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -238,7 +238,7 @@ clean: -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe $(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs_rc.o - $(CXX) -o $@ $(DIALOGS_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(DIALOGS_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/samples/dialogs/makefile.unx b/samples/dialogs/makefile.unx index 4aabfdd805..19306cef7e 100644 --- a/samples/dialogs/makefile.unx +++ b/samples/dialogs/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) dialogs: $(DIALOGS_OBJECTS) - $(CXX) -o $@ $(DIALOGS_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` + $(CXX) -o $@ $(DIALOGS_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` $(LDFLAGS) dialogs_dialogs.o: ./dialogs.cpp $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/dialogs/makefile.vc b/samples/dialogs/makefile.vc index 537d16e460..32eabd12d1 100644 --- a/samples/dialogs/makefile.vc +++ b/samples/dialogs/makefile.vc @@ -317,7 +317,7 @@ clean: -if exist $(OBJS)\dialogs.pdb del $(OBJS)\dialogs.pdb $(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\dialogs.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dialogs.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(DIALOGS_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/dialogs/makefile.wat b/samples/dialogs/makefile.wat index fa77972e3c..c74b76a8b0 100644 --- a/samples/dialogs/makefile.wat +++ b/samples/dialogs/makefile.wat @@ -267,7 +267,7 @@ $(OBJS)\dialogs.exe : $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res @%append $(OBJS)\dialogs.lbc option quiet @%append $(OBJS)\dialogs.lbc name $^@ @%append $(OBJS)\dialogs.lbc option caseexact - @%append $(OBJS)\dialogs.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\dialogs.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(DIALOGS_OBJECTS)) do @%append $(OBJS)\dialogs.lbc file %i @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\dialogs.lbc library %i @%append $(OBJS)\dialogs.lbc option resource=$(OBJS)\dialogs_dialogs.res diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in index 0f343e2101..e4d695df6e 100644 --- a/samples/dialup/Makefile.in +++ b/samples/dialup/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -71,28 +70,20 @@ NETTEST_OBJECTS = \ @COND_PLATFORM_MSDOS_0@__nettest___depname = nettest$(EXEEXT) @COND_PLATFORM_MAC_0@__nettest___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__nettest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C nettest$(EXEEXT) -@COND_PLATFORM_MAC_1@__nettest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL nettest$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___nettest___os2_emxbindcmd = $(NM) nettest$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep nettest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__nettest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___nettest___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__nettest_os2_lib_res = \ @@ -131,12 +122,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - nettest$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -158,8 +143,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile @COND_PLATFORM_MSDOS_0@nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc) -@COND_PLATFORM_MSDOS_0@ $(CXX) -o $@ $(NETTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -@COND_PLATFORM_MSDOS_0@ $(__nettest___mac_rezcmd) +@COND_PLATFORM_MSDOS_0@ $(CXX) -o $@ $(NETTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) +@COND_PLATFORM_MSDOS_0@ @COND_PLATFORM_MSDOS_0@ $(__nettest___mac_setfilecmd) @COND_PLATFORM_MSDOS_0@ $(__nettest___os2_emxbindcmd) @COND_PLATFORM_MSDOS_0@ $(SAMPLES_RPATH_POSTLINK) @@ -193,7 +178,16 @@ nettest_nettest_rc.o: $(srcdir)/nettest.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean nettest_bundle diff --git a/samples/dialup/makefile.bcc b/samples/dialup/makefile.bcc index 48bb186198..80aec3d142 100644 --- a/samples/dialup/makefile.bcc +++ b/samples/dialup/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(NETTEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\nettest_nettest.res | diff --git a/samples/dialup/makefile.gcc b/samples/dialup/makefile.gcc index 5d06a9e53a..a4c3bea4dc 100644 --- a/samples/dialup/makefile.gcc +++ b/samples/dialup/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe $(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest_rc.o - $(CXX) -o $@ $(NETTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(NETTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\nettest_nettest.o: ./nettest.cpp $(CXX) -c -o $@ $(NETTEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/dialup/makefile.unx b/samples/dialup/makefile.unx index a09c26cb23..67b5787e62 100644 --- a/samples/dialup/makefile.unx +++ b/samples/dialup/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) nettest: $(NETTEST_OBJECTS) - $(CXX) -o $@ $(NETTEST_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(NETTEST_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) nettest_nettest.o: ./nettest.cpp $(CXX) -c -o $@ $(NETTEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/dialup/makefile.vc b/samples/dialup/makefile.vc index d65a65a6a6..6b3550baf8 100644 --- a/samples/dialup/makefile.vc +++ b/samples/dialup/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\nettest.pdb del $(OBJS)\nettest.pdb $(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\nettest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\nettest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(NETTEST_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/dialup/makefile.wat b/samples/dialup/makefile.wat index b28dcbe9f9..a3d39d9ff3 100644 --- a/samples/dialup/makefile.wat +++ b/samples/dialup/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\nettest.exe : $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res @%append $(OBJS)\nettest.lbc option quiet @%append $(OBJS)\nettest.lbc name $^@ @%append $(OBJS)\nettest.lbc option caseexact - @%append $(OBJS)\nettest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\nettest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(NETTEST_OBJECTS)) do @%append $(OBJS)\nettest.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\nettest.lbc library %i @%append $(OBJS)\nettest.lbc option resource=$(OBJS)\nettest_nettest.res diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in index 41269f4cb6..3310e91978 100644 --- a/samples/display/Makefile.in +++ b/samples/display/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ DISPLAY_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__display___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__display___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C display$(EXEEXT) -@COND_PLATFORM_MAC_1@__display___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL display$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___display___os2_emxbindcmd = $(NM) display$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep display$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__display___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___display___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__display___win32rc = display_sample_rc.o @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - display$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile display$(EXEEXT): $(DISPLAY_OBJECTS) $(__display___win32rc) - $(CXX) -o $@ $(DISPLAY_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__display___mac_rezcmd) + $(CXX) -o $@ $(DISPLAY_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__display___mac_setfilecmd) $(__display___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ display_display.o: $(srcdir)/display.cpp $(CXXC) -c -o $@ $(DISPLAY_CXXFLAGS) $(srcdir)/display.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean display_bundle diff --git a/samples/display/makefile.bcc b/samples/display/makefile.bcc index a86623f50e..88fae61477 100644 --- a/samples/display/makefile.bcc +++ b/samples/display/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\display_sample.res | diff --git a/samples/display/makefile.gcc b/samples/display/makefile.gcc index 020f2e7ee8..512f6178ab 100644 --- a/samples/display/makefile.gcc +++ b/samples/display/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\display.exe del $(OBJS)\display.exe $(OBJS)\display.exe: $(DISPLAY_OBJECTS) $(OBJS)\display_sample_rc.o - $(CXX) -o $@ $(DISPLAY_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(DISPLAY_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\display_sample_rc.o: ./../../samples/sample.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH diff --git a/samples/display/makefile.unx b/samples/display/makefile.unx index b7bb91f03a..416d87161e 100644 --- a/samples/display/makefile.unx +++ b/samples/display/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) display: $(DISPLAY_OBJECTS) - $(CXX) -o $@ $(DISPLAY_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(DISPLAY_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) display_display.o: ./display.cpp $(CXX) -c -o $@ $(DISPLAY_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/display/makefile.vc b/samples/display/makefile.vc index 6f4222abdf..71f37fea47 100644 --- a/samples/display/makefile.vc +++ b/samples/display/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\display.pdb del $(OBJS)\display.pdb $(OBJS)\display.exe: $(DISPLAY_OBJECTS) $(OBJS)\display_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\display.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\display.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(DISPLAY_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/display/makefile.wat b/samples/display/makefile.wat index d88f7fa5a6..16d377a642 100644 --- a/samples/display/makefile.wat +++ b/samples/display/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\display.exe : $(DISPLAY_OBJECTS) $(OBJS)\display_sample.res @%append $(OBJS)\display.lbc option quiet @%append $(OBJS)\display.lbc name $^@ @%append $(OBJS)\display.lbc option caseexact - @%append $(OBJS)\display.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\display.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(DISPLAY_OBJECTS)) do @%append $(OBJS)\display.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\display.lbc library %i @%append $(OBJS)\display.lbc option resource=$(OBJS)\display_sample.res diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in index 65f299a386..2abcaab25e 100644 --- a/samples/dnd/Makefile.in +++ b/samples/dnd/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -69,28 +68,21 @@ DND_OBJECTS = \ @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__dnd___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__dnd___mac_setfilecmd = $(SETFILE) -a C dnd$(EXEEXT) -@COND_PLATFORM_MAC_1@__dnd___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@__dnd___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL dnd$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___dnd___os2_emxbindcmd = $(NM) dnd$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep dnd$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__dnd___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dnd___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__dnd_os2_lib_res = \ @@ -128,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - dnd$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -155,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile dnd$(EXEEXT): $(DND_OBJECTS) $(__dnd___win32rc) - $(CXX) -o $@ $(DND_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__dnd___mac_rezcmd) + $(CXX) -o $@ $(DND_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__dnd___mac_setfilecmd) $(__dnd___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -202,7 +188,16 @@ dnd_dnd_rc.o: $(srcdir)/dnd.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean dnd_bundle data diff --git a/samples/dnd/makefile.bcc b/samples/dnd/makefile.bcc index dee6bee2c1..a270e226de 100644 --- a/samples/dnd/makefile.bcc +++ b/samples/dnd/makefile.bcc @@ -229,7 +229,7 @@ clean: -if exist $(OBJS)\dnd.ils del $(OBJS)\dnd.ils $(OBJS)\dnd.exe: $(DND_OBJECTS) $(OBJS)\dnd_dnd.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dnd_dnd.res | diff --git a/samples/dnd/makefile.gcc b/samples/dnd/makefile.gcc index c5666e4beb..7b1a60d512 100644 --- a/samples/dnd/makefile.gcc +++ b/samples/dnd/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\dnd.exe del $(OBJS)\dnd.exe $(OBJS)\dnd.exe: $(DND_OBJECTS) $(OBJS)\dnd_dnd_rc.o - $(CXX) -o $@ $(DND_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(DND_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/samples/dnd/makefile.unx b/samples/dnd/makefile.unx index 407c0e4f83..f88ee4f33b 100644 --- a/samples/dnd/makefile.unx +++ b/samples/dnd/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) dnd: $(DND_OBJECTS) - $(CXX) -o $@ $(DND_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(DND_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) dnd_dnd.o: ./dnd.cpp $(CXX) -c -o $@ $(DND_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/dnd/makefile.vc b/samples/dnd/makefile.vc index cd5491373c..a2d3f05e6b 100644 --- a/samples/dnd/makefile.vc +++ b/samples/dnd/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\dnd.pdb del $(OBJS)\dnd.pdb $(OBJS)\dnd.exe: $(DND_OBJECTS) $(OBJS)\dnd_dnd.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\dnd.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dnd.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(DND_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/dnd/makefile.wat b/samples/dnd/makefile.wat index 2576fdd38c..66384a243e 100644 --- a/samples/dnd/makefile.wat +++ b/samples/dnd/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\dnd.exe : $(DND_OBJECTS) $(OBJS)\dnd_dnd.res @%append $(OBJS)\dnd.lbc option quiet @%append $(OBJS)\dnd.lbc name $^@ @%append $(OBJS)\dnd.lbc option caseexact - @%append $(OBJS)\dnd.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\dnd.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(DND_OBJECTS)) do @%append $(OBJS)\dnd.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\dnd.lbc library %i @%append $(OBJS)\dnd.lbc option resource=$(OBJS)\dnd_dnd.res diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in index 8be62dac88..dba3e82c3f 100644 --- a/samples/docview/Makefile.in +++ b/samples/docview/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -72,33 +71,20 @@ DOCVIEW_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__docview___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C docview$(EXEEXT) -COND_PLATFORM_MAC_1___docview___mac_rezcmd = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - docview$(EXEEXT) 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@ $(SETFILE) -t APPL docview$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___docview___os2_emxbindcmd = $(NM) docview$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep docview$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__docview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___docview___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__docview_os2_lib_res = \ @@ -157,13 +143,13 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc) - $(CXX) -o $@ $(DOCVIEW_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__docview___mac_rezcmd) + $(CXX) -o $@ $(DOCVIEW_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__docview___mac_setfilecmd) $(__docview___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@docview.app/Contents/PkgInfo: docview$(EXEEXT) $(srcdir)/Info.plist.in $(srcdir)/chart.icns $(srcdir)/doc.icns $(srcdir)/notepad.icns +@COND_PLATFORM_MACOSX_1@docview.app/Contents/PkgInfo: docview$(EXEEXT) $(srcdir)/Info.plist.in $(srcdir)/doc.icns $(srcdir)/chart.icns $(srcdir)/notepad.icns @COND_PLATFORM_MACOSX_1@ mkdir -p docview.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p docview.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p docview.app/Contents/Resources @@ -181,7 +167,8 @@ docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f docview$(EXEEXT) docview.app/Contents/MacOS/docview @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(srcdir)/chart.icns $(srcdir)/doc.icns $(srcdir)/notepad.icns docview.app/Contents/Resources +@COND_PLATFORM_MACOSX_1@ cp -f $(srcdir)/doc.icns docview.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(srcdir)/chart.icns $(srcdir)/notepad.icns docview.app/Contents/Resources @COND_PLATFORM_MACOSX_1@docview_bundle: $(____docview_BUNDLE_TGT_REF_DEP) @@ -208,6 +195,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ $(srcdir)/include/wx/stc/stc.h # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean docview_bundle diff --git a/samples/docview/makefile.bcc b/samples/docview/makefile.bcc index 4bab203f22..91dfa2f957 100644 --- a/samples/docview/makefile.bcc +++ b/samples/docview/makefile.bcc @@ -231,7 +231,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\docview_docview.res | diff --git a/samples/docview/makefile.gcc b/samples/docview/makefile.gcc index 6a27ea1300..2afaec76cf 100644 --- a/samples/docview/makefile.gcc +++ b/samples/docview/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -226,7 +226,7 @@ clean: -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe $(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview_rc.o - $(CXX) -o $@ $(DOCVIEW_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(DOCVIEW_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\docview_docview.o: ./docview.cpp $(CXX) -c -o $@ $(DOCVIEW_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/docview/makefile.unx b/samples/docview/makefile.unx index 6209488e05..c146d114a5 100644 --- a/samples/docview/makefile.unx +++ b/samples/docview/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -100,7 +100,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) docview: $(DOCVIEW_OBJECTS) - $(CXX) -o $@ $(DOCVIEW_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(DOCVIEW_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) docview_docview.o: ./docview.cpp $(CXX) -c -o $@ $(DOCVIEW_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/docview/makefile.vc b/samples/docview/makefile.vc index e149507d16..d0d10c14d4 100644 --- a/samples/docview/makefile.vc +++ b/samples/docview/makefile.vc @@ -307,7 +307,7 @@ clean: -if exist $(OBJS)\docview.pdb del $(OBJS)\docview.pdb $(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\docview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\docview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(DOCVIEW_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/docview/makefile.wat b/samples/docview/makefile.wat index 15a1e3df3f..ae7472ed3f 100644 --- a/samples/docview/makefile.wat +++ b/samples/docview/makefile.wat @@ -253,7 +253,7 @@ $(OBJS)\docview.exe : $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res @%append $(OBJS)\docview.lbc option quiet @%append $(OBJS)\docview.lbc name $^@ @%append $(OBJS)\docview.lbc option caseexact - @%append $(OBJS)\docview.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\docview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(DOCVIEW_OBJECTS)) do @%append $(OBJS)\docview.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\docview.lbc library %i @%append $(OBJS)\docview.lbc option resource=$(OBJS)\docview_docview.res diff --git a/samples/docvwmdi/Makefile.in b/samples/docvwmdi/Makefile.in index abd3792049..10bc335da3 100644 --- a/samples/docvwmdi/Makefile.in +++ b/samples/docvwmdi/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -72,28 +71,20 @@ DOCVWMDI_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__docvwmdi___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__docvwmdi___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C docvwmdi$(EXEEXT) -@COND_PLATFORM_MAC_1@__docvwmdi___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL docvwmdi$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___docvwmdi___os2_emxbindcmd = $(NM) docvwmdi$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep docvwmdi$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__docvwmdi___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___docvwmdi___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__docvwmdi_os2_lib_res = \ @@ -131,12 +122,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - docvwmdi$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -158,8 +143,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile docvwmdi$(EXEEXT): $(DOCVWMDI_OBJECTS) $(__docvwmdi___win32rc) - $(CXX) -o $@ $(DOCVWMDI_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__docvwmdi___mac_rezcmd) + $(CXX) -o $@ $(DOCVWMDI_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__docvwmdi___mac_setfilecmd) $(__docvwmdi___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -199,7 +184,16 @@ docvwmdi_docview_rc.o: $(srcdir)/docview.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean docvwmdi_bundle diff --git a/samples/docvwmdi/makefile.bcc b/samples/docvwmdi/makefile.bcc index 7c00963fc2..401b3f2c7f 100644 --- a/samples/docvwmdi/makefile.bcc +++ b/samples/docvwmdi/makefile.bcc @@ -231,7 +231,7 @@ clean: -if exist $(OBJS)\docvwmdi.ils del $(OBJS)\docvwmdi.ils $(OBJS)\docvwmdi.exe: $(DOCVWMDI_OBJECTS) $(OBJS)\docvwmdi_docview.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(DOCVWMDI_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\docvwmdi_docview.res | diff --git a/samples/docvwmdi/makefile.gcc b/samples/docvwmdi/makefile.gcc index 0e2640193a..be7ce36396 100644 --- a/samples/docvwmdi/makefile.gcc +++ b/samples/docvwmdi/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -226,7 +226,7 @@ clean: -if exist $(OBJS)\docvwmdi.exe del $(OBJS)\docvwmdi.exe $(OBJS)\docvwmdi.exe: $(DOCVWMDI_OBJECTS) $(OBJS)\docvwmdi_docview_rc.o - $(CXX) -o $@ $(DOCVWMDI_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(DOCVWMDI_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\docvwmdi_docview.o: ./docview.cpp $(CXX) -c -o $@ $(DOCVWMDI_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/docvwmdi/makefile.unx b/samples/docvwmdi/makefile.unx index 1c0c67d728..e008bfb422 100644 --- a/samples/docvwmdi/makefile.unx +++ b/samples/docvwmdi/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -100,7 +100,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) docvwmdi: $(DOCVWMDI_OBJECTS) - $(CXX) -o $@ $(DOCVWMDI_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(DOCVWMDI_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) docvwmdi_docview.o: ./docview.cpp $(CXX) -c -o $@ $(DOCVWMDI_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/docvwmdi/makefile.vc b/samples/docvwmdi/makefile.vc index c7ad4f8238..fd95115533 100644 --- a/samples/docvwmdi/makefile.vc +++ b/samples/docvwmdi/makefile.vc @@ -307,7 +307,7 @@ clean: -if exist $(OBJS)\docvwmdi.pdb del $(OBJS)\docvwmdi.pdb $(OBJS)\docvwmdi.exe: $(DOCVWMDI_OBJECTS) $(OBJS)\docvwmdi_docview.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\docvwmdi.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\docvwmdi.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(DOCVWMDI_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/docvwmdi/makefile.wat b/samples/docvwmdi/makefile.wat index 785f446b1e..b7bc47a7dd 100644 --- a/samples/docvwmdi/makefile.wat +++ b/samples/docvwmdi/makefile.wat @@ -253,7 +253,7 @@ $(OBJS)\docvwmdi.exe : $(DOCVWMDI_OBJECTS) $(OBJS)\docvwmdi_docview.res @%append $(OBJS)\docvwmdi.lbc option quiet @%append $(OBJS)\docvwmdi.lbc name $^@ @%append $(OBJS)\docvwmdi.lbc option caseexact - @%append $(OBJS)\docvwmdi.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\docvwmdi.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(DOCVWMDI_OBJECTS)) do @%append $(OBJS)\docvwmdi.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\docvwmdi.lbc library %i @%append $(OBJS)\docvwmdi.lbc option resource=$(OBJS)\docvwmdi_docview.res diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in index 69aa04af39..6015707368 100644 --- a/samples/dragimag/Makefile.in +++ b/samples/dragimag/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ DRAGIMAG_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__dragimag___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__dragimag___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C dragimag$(EXEEXT) -@COND_PLATFORM_MAC_1@__dragimag___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL dragimag$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___dragimag___os2_emxbindcmd = $(NM) dragimag$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep dragimag$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__dragimag___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dragimag___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__dragimag_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - dragimag$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile dragimag$(EXEEXT): $(DRAGIMAG_OBJECTS) $(__dragimag___win32rc) - $(CXX) -o $@ $(DRAGIMAG_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__dragimag___mac_rezcmd) + $(CXX) -o $@ $(DRAGIMAG_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__dragimag___mac_setfilecmd) $(__dragimag___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -203,7 +188,16 @@ dragimag_dragimag_rc.o: $(srcdir)/dragimag.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean dragimag_bundle data diff --git a/samples/dragimag/makefile.bcc b/samples/dragimag/makefile.bcc index 0812df95da..27187aca73 100644 --- a/samples/dragimag/makefile.bcc +++ b/samples/dragimag/makefile.bcc @@ -229,7 +229,7 @@ clean: -if exist $(OBJS)\dragimag.ils del $(OBJS)\dragimag.ils $(OBJS)\dragimag.exe: $(DRAGIMAG_OBJECTS) $(OBJS)\dragimag_dragimag.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dragimag_dragimag.res | diff --git a/samples/dragimag/makefile.gcc b/samples/dragimag/makefile.gcc index 5f8451771a..587b316b91 100644 --- a/samples/dragimag/makefile.gcc +++ b/samples/dragimag/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\dragimag.exe del $(OBJS)\dragimag.exe $(OBJS)\dragimag.exe: $(DRAGIMAG_OBJECTS) $(OBJS)\dragimag_dragimag_rc.o - $(CXX) -o $@ $(DRAGIMAG_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(DRAGIMAG_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/samples/dragimag/makefile.unx b/samples/dragimag/makefile.unx index f8fa40d29b..fdc77efbeb 100644 --- a/samples/dragimag/makefile.unx +++ b/samples/dragimag/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) dragimag: $(DRAGIMAG_OBJECTS) - $(CXX) -o $@ $(DRAGIMAG_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(DRAGIMAG_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) dragimag_dragimag.o: ./dragimag.cpp $(CXX) -c -o $@ $(DRAGIMAG_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/dragimag/makefile.vc b/samples/dragimag/makefile.vc index 59f3d70de8..4a2b59c2c8 100644 --- a/samples/dragimag/makefile.vc +++ b/samples/dragimag/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\dragimag.pdb del $(OBJS)\dragimag.pdb $(OBJS)\dragimag.exe: $(DRAGIMAG_OBJECTS) $(OBJS)\dragimag_dragimag.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\dragimag.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dragimag.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(DRAGIMAG_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/dragimag/makefile.wat b/samples/dragimag/makefile.wat index 72aeb2a1c2..e69faf86fa 100644 --- a/samples/dragimag/makefile.wat +++ b/samples/dragimag/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\dragimag.exe : $(DRAGIMAG_OBJECTS) $(OBJS)\dragimag_dragimag.res @%append $(OBJS)\dragimag.lbc option quiet @%append $(OBJS)\dragimag.lbc name $^@ @%append $(OBJS)\dragimag.lbc option caseexact - @%append $(OBJS)\dragimag.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\dragimag.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(DRAGIMAG_OBJECTS)) do @%append $(OBJS)\dragimag.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\dragimag.lbc library %i @%append $(OBJS)\dragimag.lbc option resource=$(OBJS)\dragimag_dragimag.res diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in index cd3a87b914..f9e3a1cb52 100644 --- a/samples/drawing/Makefile.in +++ b/samples/drawing/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ DRAWING_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__drawing___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__drawing___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C drawing$(EXEEXT) -@COND_PLATFORM_MAC_1@__drawing___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL drawing$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___drawing___os2_emxbindcmd = $(NM) drawing$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep drawing$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__drawing___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___drawing___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__drawing_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - drawing$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile drawing$(EXEEXT): $(DRAWING_OBJECTS) $(__drawing___win32rc) - $(CXX) -o $@ $(DRAWING_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__drawing___mac_rezcmd) + $(CXX) -o $@ $(DRAWING_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__drawing___mac_setfilecmd) $(__drawing___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -203,7 +188,16 @@ drawing_drawing_rc.o: $(srcdir)/drawing.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean drawing_bundle data diff --git a/samples/drawing/makefile.bcc b/samples/drawing/makefile.bcc index 254128c253..9988ab3cbe 100644 --- a/samples/drawing/makefile.bcc +++ b/samples/drawing/makefile.bcc @@ -229,7 +229,7 @@ clean: -if exist $(OBJS)\drawing.ils del $(OBJS)\drawing.ils $(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(DRAWING_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\drawing_drawing.res | diff --git a/samples/drawing/makefile.gcc b/samples/drawing/makefile.gcc index 190af5be73..5d7a5b5c92 100644 --- a/samples/drawing/makefile.gcc +++ b/samples/drawing/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe $(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing_rc.o - $(CXX) -o $@ $(DRAWING_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(DRAWING_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/samples/drawing/makefile.unx b/samples/drawing/makefile.unx index c6cd830e14..021008b781 100644 --- a/samples/drawing/makefile.unx +++ b/samples/drawing/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) drawing: $(DRAWING_OBJECTS) - $(CXX) -o $@ $(DRAWING_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(DRAWING_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) drawing_drawing.o: ./drawing.cpp $(CXX) -c -o $@ $(DRAWING_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/drawing/makefile.vc b/samples/drawing/makefile.vc index 20fcde78b6..91f5f4b7c6 100644 --- a/samples/drawing/makefile.vc +++ b/samples/drawing/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\drawing.pdb del $(OBJS)\drawing.pdb $(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\drawing.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\drawing.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(DRAWING_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/drawing/makefile.wat b/samples/drawing/makefile.wat index 5239e86013..c379dc8c0d 100644 --- a/samples/drawing/makefile.wat +++ b/samples/drawing/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\drawing.exe : $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res @%append $(OBJS)\drawing.lbc option quiet @%append $(OBJS)\drawing.lbc name $^@ @%append $(OBJS)\drawing.lbc option caseexact - @%append $(OBJS)\drawing.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\drawing.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(DRAWING_OBJECTS)) do @%append $(OBJS)\drawing.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\drawing.lbc library %i @%append $(OBJS)\drawing.lbc option resource=$(OBJS)\drawing_drawing.res diff --git a/samples/editlbox/Makefile.in b/samples/editlbox/Makefile.in index 2c0e800b0d..a4b32d1771 100644 --- a/samples/editlbox/Makefile.in +++ b/samples/editlbox/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -72,28 +71,20 @@ EDITLBOX_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__editlbox___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__editlbox___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C editlbox$(EXEEXT) -@COND_PLATFORM_MAC_1@__editlbox___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL editlbox$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___editlbox___os2_emxbindcmd = $(NM) editlbox$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep editlbox$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__editlbox___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___editlbox___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__editlbox___win32rc = editlbox_sample_rc.o @@ -134,12 +125,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - editlbox$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -161,8 +146,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile editlbox$(EXEEXT): $(EDITLBOX_OBJECTS) $(__editlbox___win32rc) - $(CXX) -o $@ $(EDITLBOX_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__editlbox___mac_rezcmd) + $(CXX) -o $@ $(EDITLBOX_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__editlbox___mac_setfilecmd) $(__editlbox___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -196,7 +181,16 @@ editlbox_editlbox.o: $(srcdir)/editlbox.cpp $(CXXC) -c -o $@ $(EDITLBOX_CXXFLAGS) $(srcdir)/editlbox.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean editlbox_bundle diff --git a/samples/editlbox/makefile.bcc b/samples/editlbox/makefile.bcc index 437644ef8c..63572be85b 100644 --- a/samples/editlbox/makefile.bcc +++ b/samples/editlbox/makefile.bcc @@ -233,7 +233,7 @@ clean: -if exist $(OBJS)\editlbox.ils del $(OBJS)\editlbox.ils $(OBJS)\editlbox.exe: $(EDITLBOX_OBJECTS) $(OBJS)\editlbox_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(EDITLBOX_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\editlbox_sample.res | diff --git a/samples/editlbox/makefile.gcc b/samples/editlbox/makefile.gcc index ff8b930373..cabaeaeec0 100644 --- a/samples/editlbox/makefile.gcc +++ b/samples/editlbox/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: -if exist $(OBJS)\editlbox.exe del $(OBJS)\editlbox.exe $(OBJS)\editlbox.exe: $(EDITLBOX_OBJECTS) $(OBJS)\editlbox_sample_rc.o - $(CXX) -o $@ $(EDITLBOX_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(EDITLBOX_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\editlbox_sample_rc.o: ./../../samples/sample.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH diff --git a/samples/editlbox/makefile.unx b/samples/editlbox/makefile.unx index a936552f1b..61aab70e8f 100644 --- a/samples/editlbox/makefile.unx +++ b/samples/editlbox/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) editlbox: $(EDITLBOX_OBJECTS) - $(CXX) -o $@ $(EDITLBOX_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` + $(CXX) -o $@ $(EDITLBOX_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` $(LDFLAGS) editlbox_editlbox.o: ./editlbox.cpp $(CXX) -c -o $@ $(EDITLBOX_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/editlbox/makefile.vc b/samples/editlbox/makefile.vc index 411c0fb069..459ab3a037 100644 --- a/samples/editlbox/makefile.vc +++ b/samples/editlbox/makefile.vc @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\editlbox.pdb del $(OBJS)\editlbox.pdb $(OBJS)\editlbox.exe: $(EDITLBOX_OBJECTS) $(OBJS)\editlbox_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\editlbox.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\editlbox.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(EDITLBOX_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/editlbox/makefile.wat b/samples/editlbox/makefile.wat index 55b0848f34..2542f831bf 100644 --- a/samples/editlbox/makefile.wat +++ b/samples/editlbox/makefile.wat @@ -256,7 +256,7 @@ $(OBJS)\editlbox.exe : $(EDITLBOX_OBJECTS) $(OBJS)\editlbox_sample.res @%append $(OBJS)\editlbox.lbc option quiet @%append $(OBJS)\editlbox.lbc name $^@ @%append $(OBJS)\editlbox.lbc option caseexact - @%append $(OBJS)\editlbox.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\editlbox.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(EDITLBOX_OBJECTS)) do @%append $(OBJS)\editlbox.lbc file %i @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\editlbox.lbc library %i @%append $(OBJS)\editlbox.lbc option resource=$(OBJS)\editlbox_sample.res diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in index 8dbdadf593..68616814de 100644 --- a/samples/erase/Makefile.in +++ b/samples/erase/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ ERASE_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__erase___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__erase___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C erase$(EXEEXT) -@COND_PLATFORM_MAC_1@__erase___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL erase$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___erase___os2_emxbindcmd = $(NM) erase$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep erase$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__erase___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___erase___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__erase_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - erase$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile erase$(EXEEXT): $(ERASE_OBJECTS) $(__erase___win32rc) - $(CXX) -o $@ $(ERASE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__erase___mac_rezcmd) + $(CXX) -o $@ $(ERASE_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__erase___mac_setfilecmd) $(__erase___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ erase_erase_rc.o: $(srcdir)/erase.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean erase_bundle diff --git a/samples/erase/makefile.bcc b/samples/erase/makefile.bcc index b3678b5ae6..c1c1436f05 100644 --- a/samples/erase/makefile.bcc +++ b/samples/erase/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(ERASE_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\erase_erase.res | diff --git a/samples/erase/makefile.gcc b/samples/erase/makefile.gcc index faf53918c7..16cf62037a 100644 --- a/samples/erase/makefile.gcc +++ b/samples/erase/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe $(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_erase_rc.o - $(CXX) -o $@ $(ERASE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(ERASE_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\erase_erase.o: ./erase.cpp $(CXX) -c -o $@ $(ERASE_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/erase/makefile.unx b/samples/erase/makefile.unx index acbe1378bc..696ff147cf 100644 --- a/samples/erase/makefile.unx +++ b/samples/erase/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) erase: $(ERASE_OBJECTS) - $(CXX) -o $@ $(ERASE_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(ERASE_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) erase_erase.o: ./erase.cpp $(CXX) -c -o $@ $(ERASE_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/erase/makefile.vc b/samples/erase/makefile.vc index bcf3e408fc..48879b23f4 100644 --- a/samples/erase/makefile.vc +++ b/samples/erase/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\erase.pdb del $(OBJS)\erase.pdb $(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_erase.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\erase.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\erase.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(ERASE_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/erase/makefile.wat b/samples/erase/makefile.wat index b1201d5d39..1a5d4b8cd5 100644 --- a/samples/erase/makefile.wat +++ b/samples/erase/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\erase.exe : $(ERASE_OBJECTS) $(OBJS)\erase_erase.res @%append $(OBJS)\erase.lbc option quiet @%append $(OBJS)\erase.lbc name $^@ @%append $(OBJS)\erase.lbc option caseexact - @%append $(OBJS)\erase.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\erase.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(ERASE_OBJECTS)) do @%append $(OBJS)\erase.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\erase.lbc library %i @%append $(OBJS)\erase.lbc option resource=$(OBJS)\erase_erase.res diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in index f93f7d26cd..ef25e8174d 100644 --- a/samples/event/Makefile.in +++ b/samples/event/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ EVENT_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__event___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__event___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C event$(EXEEXT) -@COND_PLATFORM_MAC_1@__event___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL event$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___event___os2_emxbindcmd = $(NM) event$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep event$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__event___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___event___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__event_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - event$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile event$(EXEEXT): $(EVENT_OBJECTS) $(__event___win32rc) - $(CXX) -o $@ $(EVENT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__event___mac_rezcmd) + $(CXX) -o $@ $(EVENT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__event___mac_setfilecmd) $(__event___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ event_event_rc.o: $(srcdir)/event.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean event_bundle diff --git a/samples/event/makefile.bcc b/samples/event/makefile.bcc index 9d0c12880f..83905326a4 100644 --- a/samples/event/makefile.bcc +++ b/samples/event/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(EVENT_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\event_event.res | diff --git a/samples/event/makefile.gcc b/samples/event/makefile.gcc index 3d0fdb34ee..2d289df3da 100644 --- a/samples/event/makefile.gcc +++ b/samples/event/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\event.exe del $(OBJS)\event.exe $(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_event_rc.o - $(CXX) -o $@ $(EVENT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(EVENT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\event_event.o: ./event.cpp $(CXX) -c -o $@ $(EVENT_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/event/makefile.unx b/samples/event/makefile.unx index fa6b2ae578..7218529b6f 100644 --- a/samples/event/makefile.unx +++ b/samples/event/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) event: $(EVENT_OBJECTS) - $(CXX) -o $@ $(EVENT_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(EVENT_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) event_event.o: ./event.cpp $(CXX) -c -o $@ $(EVENT_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/event/makefile.vc b/samples/event/makefile.vc index 03957c92a4..31b2a80094 100644 --- a/samples/event/makefile.vc +++ b/samples/event/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\event.pdb del $(OBJS)\event.pdb $(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_event.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\event.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\event.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(EVENT_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/event/makefile.wat b/samples/event/makefile.wat index f09c2223fd..9c6370766a 100644 --- a/samples/event/makefile.wat +++ b/samples/event/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\event.exe : $(EVENT_OBJECTS) $(OBJS)\event_event.res @%append $(OBJS)\event.lbc option quiet @%append $(OBJS)\event.lbc name $^@ @%append $(OBJS)\event.lbc option caseexact - @%append $(OBJS)\event.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\event.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(EVENT_OBJECTS)) do @%append $(OBJS)\event.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\event.lbc library %i @%append $(OBJS)\event.lbc option resource=$(OBJS)\event_event.res diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in index 669dafd219..6dd7f3e4b7 100644 --- a/samples/except/Makefile.in +++ b/samples/except/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ EXCEPT_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__except___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__except___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C except$(EXEEXT) -@COND_PLATFORM_MAC_1@__except___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL except$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___except___os2_emxbindcmd = $(NM) except$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep except$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__except___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___except___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__except___win32rc = except_sample_rc.o @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - except$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile except$(EXEEXT): $(EXCEPT_OBJECTS) $(__except___win32rc) - $(CXX) -o $@ $(EXCEPT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__except___mac_rezcmd) + $(CXX) -o $@ $(EXCEPT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__except___mac_setfilecmd) $(__except___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ except_except.o: $(srcdir)/except.cpp $(CXXC) -c -o $@ $(EXCEPT_CXXFLAGS) $(srcdir)/except.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean except_bundle diff --git a/samples/except/makefile.bcc b/samples/except/makefile.bcc index 492097a5f5..55400b759a 100644 --- a/samples/except/makefile.bcc +++ b/samples/except/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\except_sample.res | diff --git a/samples/except/makefile.gcc b/samples/except/makefile.gcc index 9fb2a82f78..2769a8adcd 100644 --- a/samples/except/makefile.gcc +++ b/samples/except/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\except.exe del $(OBJS)\except.exe $(OBJS)\except.exe: $(EXCEPT_OBJECTS) $(OBJS)\except_sample_rc.o - $(CXX) -o $@ $(EXCEPT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(EXCEPT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\except_sample_rc.o: ./../../samples/sample.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH diff --git a/samples/except/makefile.unx b/samples/except/makefile.unx index 6f1c13eb5a..923c2d17cd 100644 --- a/samples/except/makefile.unx +++ b/samples/except/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) except: $(EXCEPT_OBJECTS) - $(CXX) -o $@ $(EXCEPT_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(EXCEPT_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) except_except.o: ./except.cpp $(CXX) -c -o $@ $(EXCEPT_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/except/makefile.vc b/samples/except/makefile.vc index 4e9074b9bb..91f0a96653 100644 --- a/samples/except/makefile.vc +++ b/samples/except/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\except.pdb del $(OBJS)\except.pdb $(OBJS)\except.exe: $(EXCEPT_OBJECTS) $(OBJS)\except_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\except.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\except.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(EXCEPT_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/except/makefile.wat b/samples/except/makefile.wat index 84113b5027..e0dcf47643 100644 --- a/samples/except/makefile.wat +++ b/samples/except/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\except.exe : $(EXCEPT_OBJECTS) $(OBJS)\except_sample.res @%append $(OBJS)\except.lbc option quiet @%append $(OBJS)\except.lbc name $^@ @%append $(OBJS)\except.lbc option caseexact - @%append $(OBJS)\except.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\except.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(EXCEPT_OBJECTS)) do @%append $(OBJS)\except.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\except.lbc library %i @%append $(OBJS)\except.lbc option resource=$(OBJS)\except_sample.res diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in index 329b50bd56..4341e9f4f1 100644 --- a/samples/exec/Makefile.in +++ b/samples/exec/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ EXEC_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__exec___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__exec___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C exec$(EXEEXT) -@COND_PLATFORM_MAC_1@__exec___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL exec$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___exec___os2_emxbindcmd = $(NM) exec$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep exec$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__exec___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___exec___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__exec___win32rc = exec_sample_rc.o @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - exec$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile exec$(EXEEXT): $(EXEC_OBJECTS) $(__exec___win32rc) - $(CXX) -o $@ $(EXEC_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__exec___mac_rezcmd) + $(CXX) -o $@ $(EXEC_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__exec___mac_setfilecmd) $(__exec___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -201,6 +186,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ $(srcdir)/include/wx/stc/stc.h # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean exec_bundle diff --git a/samples/exec/makefile.bcc b/samples/exec/makefile.bcc index 023680edfd..3442d0fcb7 100644 --- a/samples/exec/makefile.bcc +++ b/samples/exec/makefile.bcc @@ -229,7 +229,7 @@ clean: -if exist $(OBJS)\exec.ils del $(OBJS)\exec.ils $(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\exec_sample.res | diff --git a/samples/exec/makefile.gcc b/samples/exec/makefile.gcc index 343418a842..08d70bf699 100644 --- a/samples/exec/makefile.gcc +++ b/samples/exec/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe $(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_sample_rc.o - $(CXX) -o $@ $(EXEC_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(EXEC_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\exec_sample_rc.o: ./../../samples/sample.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH diff --git a/samples/exec/makefile.unx b/samples/exec/makefile.unx index 80ec2c3558..d49c8e6328 100644 --- a/samples/exec/makefile.unx +++ b/samples/exec/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) exec: $(EXEC_OBJECTS) - $(CXX) -o $@ $(EXEC_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(EXEC_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) exec_exec.o: ./exec.cpp $(CXX) -c -o $@ $(EXEC_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/exec/makefile.vc b/samples/exec/makefile.vc index 91a589a1bb..fb6bfead58 100644 --- a/samples/exec/makefile.vc +++ b/samples/exec/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\exec.pdb del $(OBJS)\exec.pdb $(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\exec.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\exec.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(EXEC_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/exec/makefile.wat b/samples/exec/makefile.wat index 71670dee13..d407b9322d 100644 --- a/samples/exec/makefile.wat +++ b/samples/exec/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\exec.exe : $(EXEC_OBJECTS) $(OBJS)\exec_sample.res @%append $(OBJS)\exec.lbc option quiet @%append $(OBJS)\exec.lbc name $^@ @%append $(OBJS)\exec.lbc option caseexact - @%append $(OBJS)\exec.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\exec.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(EXEC_OBJECTS)) do @%append $(OBJS)\exec.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\exec.lbc library %i @%append $(OBJS)\exec.lbc option resource=$(OBJS)\exec_sample.res diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in index 01f19be91b..75710360de 100644 --- a/samples/font/Makefile.in +++ b/samples/font/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ FONT_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__font___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__font___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C font$(EXEEXT) -@COND_PLATFORM_MAC_1@__font___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL font$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___font___os2_emxbindcmd = $(NM) font$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep font$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__font___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___font___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__font_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - font$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile font$(EXEEXT): $(FONT_OBJECTS) $(__font___win32rc) - $(CXX) -o $@ $(FONT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__font___mac_rezcmd) + $(CXX) -o $@ $(FONT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__font___mac_setfilecmd) $(__font___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ font_font_rc.o: $(srcdir)/font.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean font_bundle diff --git a/samples/font/font.cpp b/samples/font/font.cpp index 8c8a91c5d4..f6c8d5f32d 100644 --- a/samples/font/font.cpp +++ b/samples/font/font.cpp @@ -36,7 +36,7 @@ #ifdef __WXMAC__ #undef wxFontDialog - #include "wx/mac/fontdlg.h" + #include "wx/osx/fontdlg.h" #endif // used as title for several dialog boxes diff --git a/samples/font/makefile.bcc b/samples/font/makefile.bcc index f5a95f2657..e9ac34fcb2 100644 --- a/samples/font/makefile.bcc +++ b/samples/font/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(FONT_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\font_font.res | diff --git a/samples/font/makefile.gcc b/samples/font/makefile.gcc index 36f23f6d08..1517e2b047 100644 --- a/samples/font/makefile.gcc +++ b/samples/font/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\font.exe del $(OBJS)\font.exe $(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_font_rc.o - $(CXX) -o $@ $(FONT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(FONT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\font_font.o: ./font.cpp $(CXX) -c -o $@ $(FONT_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/font/makefile.unx b/samples/font/makefile.unx index fdfd46c883..098d8567c6 100644 --- a/samples/font/makefile.unx +++ b/samples/font/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) font: $(FONT_OBJECTS) - $(CXX) -o $@ $(FONT_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(FONT_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) font_font.o: ./font.cpp $(CXX) -c -o $@ $(FONT_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/font/makefile.vc b/samples/font/makefile.vc index 0f3d23da04..114746eda7 100644 --- a/samples/font/makefile.vc +++ b/samples/font/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\font.pdb del $(OBJS)\font.pdb $(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_font.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\font.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\font.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(FONT_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/font/makefile.wat b/samples/font/makefile.wat index 513a041165..5b9bcfbaba 100644 --- a/samples/font/makefile.wat +++ b/samples/font/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\font.exe : $(FONT_OBJECTS) $(OBJS)\font_font.res @%append $(OBJS)\font.lbc option quiet @%append $(OBJS)\font.lbc name $^@ @%append $(OBJS)\font.lbc option caseexact - @%append $(OBJS)\font.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\font.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(FONT_OBJECTS)) do @%append $(OBJS)\font.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\font.lbc library %i @%append $(OBJS)\font.lbc option resource=$(OBJS)\font_font.res diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in index d43dbc46f1..2d2c4f5050 100644 --- a/samples/grid/Makefile.in +++ b/samples/grid/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -74,28 +73,20 @@ GRID_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__grid___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__grid___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C grid$(EXEEXT) -@COND_PLATFORM_MAC_1@__grid___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL grid$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___grid___os2_emxbindcmd = $(NM) grid$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep grid$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__grid___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___grid___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__grid_os2_lib_res = \ @@ -142,12 +133,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - grid$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -169,8 +154,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc) - $(CXX) -o $@ $(GRID_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__grid___mac_rezcmd) + $(CXX) -o $@ $(GRID_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__grid___mac_setfilecmd) $(__grid___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -204,7 +189,16 @@ grid_griddemo_rc.o: $(srcdir)/griddemo.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean grid_bundle diff --git a/samples/grid/makefile.bcc b/samples/grid/makefile.bcc index febbff7134..41d1472062 100644 --- a/samples/grid/makefile.bcc +++ b/samples/grid/makefile.bcc @@ -241,7 +241,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(GRID_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\grid_griddemo.res | diff --git a/samples/grid/makefile.gcc b/samples/grid/makefile.gcc index 3aa2c5fd49..1e54380967 100644 --- a/samples/grid/makefile.gcc +++ b/samples/grid/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -236,7 +236,7 @@ clean: -if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe $(OBJS)\grid.exe: $(GRID_OBJECTS) $(OBJS)\grid_griddemo_rc.o - $(CXX) -o $@ $(GRID_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(GRID_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\grid_griddemo.o: ./griddemo.cpp $(CXX) -c -o $@ $(GRID_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/grid/makefile.unx b/samples/grid/makefile.unx index 6bad932b60..de4e7f0a29 100644 --- a/samples/grid/makefile.unx +++ b/samples/grid/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) grid: $(GRID_OBJECTS) - $(CXX) -o $@ $(GRID_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,html,xml,core,base` + $(CXX) -o $@ $(GRID_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,html,xml,core,base` $(LDFLAGS) grid_griddemo.o: ./griddemo.cpp $(CXX) -c -o $@ $(GRID_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/grid/makefile.vc b/samples/grid/makefile.vc index c70c0b0ec5..9c8836fe65 100644 --- a/samples/grid/makefile.vc +++ b/samples/grid/makefile.vc @@ -317,7 +317,7 @@ clean: -if exist $(OBJS)\grid.pdb del $(OBJS)\grid.pdb $(OBJS)\grid.exe: $(GRID_OBJECTS) $(OBJS)\grid_griddemo.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\grid.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\grid.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(GRID_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/grid/makefile.wat b/samples/grid/makefile.wat index e5e16c85c9..6c6b1d3bec 100644 --- a/samples/grid/makefile.wat +++ b/samples/grid/makefile.wat @@ -266,7 +266,7 @@ $(OBJS)\grid.exe : $(GRID_OBJECTS) $(OBJS)\grid_griddemo.res @%append $(OBJS)\grid.lbc option quiet @%append $(OBJS)\grid.lbc name $^@ @%append $(OBJS)\grid.lbc option caseexact - @%append $(OBJS)\grid.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\grid.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(GRID_OBJECTS)) do @%append $(OBJS)\grid.lbc file %i @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\grid.lbc library %i @%append $(OBJS)\grid.lbc option resource=$(OBJS)\grid_griddemo.res diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in index a1612a4d47..88909d236c 100644 --- a/samples/help/Makefile.in +++ b/samples/help/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -73,28 +72,20 @@ HELP_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__help___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__help___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C help$(EXEEXT) -@COND_PLATFORM_MAC_1@__help___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL help$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___help___os2_emxbindcmd = $(NM) help$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep help$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__help___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___help___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__help_os2_lib_res = \ @@ -138,12 +129,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - help$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -165,8 +150,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc) - $(CXX) -o $@ $(HELP_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__help___mac_rezcmd) + $(CXX) -o $@ $(HELP_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__help___mac_setfilecmd) $(__help___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -224,7 +209,16 @@ help_demo_rc.o: $(srcdir)/demo.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean help_bundle data data_doc diff --git a/samples/help/makefile.bcc b/samples/help/makefile.bcc index 27ad746032..f160ad59fe 100644 --- a/samples/help/makefile.bcc +++ b/samples/help/makefile.bcc @@ -237,7 +237,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(HELP_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\help_demo.res | diff --git a/samples/help/makefile.gcc b/samples/help/makefile.gcc index 471cb21480..789df56c89 100644 --- a/samples/help/makefile.gcc +++ b/samples/help/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -232,7 +232,7 @@ clean: -if exist $(OBJS)\help.exe del $(OBJS)\help.exe $(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo_rc.o - $(CXX) -o $@ $(HELP_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(HELP_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/samples/help/makefile.unx b/samples/help/makefile.unx index 22984aff28..eec47f55aa 100644 --- a/samples/help/makefile.unx +++ b/samples/help/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) help: $(HELP_OBJECTS) - $(CXX) -o $@ $(HELP_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs html,adv,core,base` + $(CXX) -o $@ $(HELP_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs html,adv,core,base` $(LDFLAGS) help_demo.o: ./demo.cpp $(CXX) -c -o $@ $(HELP_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/help/makefile.vc b/samples/help/makefile.vc index 02c890526b..ad2b12d123 100644 --- a/samples/help/makefile.vc +++ b/samples/help/makefile.vc @@ -313,7 +313,7 @@ clean: -if exist $(OBJS)\help.pdb del $(OBJS)\help.pdb $(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\help.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\help.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(HELP_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/help/makefile.wat b/samples/help/makefile.wat index 5a4efd19a5..04197561e9 100644 --- a/samples/help/makefile.wat +++ b/samples/help/makefile.wat @@ -261,7 +261,7 @@ $(OBJS)\help.exe : $(HELP_OBJECTS) $(OBJS)\help_demo.res @%append $(OBJS)\help.lbc option quiet @%append $(OBJS)\help.lbc name $^@ @%append $(OBJS)\help.lbc option caseexact - @%append $(OBJS)\help.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\help.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(HELP_OBJECTS)) do @%append $(OBJS)\help.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\help.lbc library %i @%append $(OBJS)\help.lbc option resource=$(OBJS)\help_demo.res diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in index 0c4a3d043c..d89e15044c 100644 --- a/samples/htlbox/Makefile.in +++ b/samples/htlbox/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -71,28 +70,20 @@ HTLBOX_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__htlbox___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__htlbox___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C htlbox$(EXEEXT) -@COND_PLATFORM_MAC_1@__htlbox___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL htlbox$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___htlbox___os2_emxbindcmd = $(NM) htlbox$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep htlbox$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__htlbox___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___htlbox___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__htlbox_os2_lib_res = \ @@ -133,12 +124,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - htlbox$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -160,8 +145,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc) - $(CXX) -o $@ $(HTLBOX_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__htlbox___mac_rezcmd) + $(CXX) -o $@ $(HTLBOX_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__htlbox___mac_setfilecmd) $(__htlbox___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -195,7 +180,16 @@ htlbox_htlbox_rc.o: $(srcdir)/htlbox.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean htlbox_bundle diff --git a/samples/htlbox/makefile.bcc b/samples/htlbox/makefile.bcc index a1d812ef36..1e709d08a1 100644 --- a/samples/htlbox/makefile.bcc +++ b/samples/htlbox/makefile.bcc @@ -233,7 +233,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(HTLBOX_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htlbox_htlbox.res | diff --git a/samples/htlbox/makefile.gcc b/samples/htlbox/makefile.gcc index 4b5cb7b7b4..52174803f8 100644 --- a/samples/htlbox/makefile.gcc +++ b/samples/htlbox/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe $(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox_rc.o - $(CXX) -o $@ $(HTLBOX_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(HTLBOX_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\htlbox_htlbox.o: ./htlbox.cpp $(CXX) -c -o $@ $(HTLBOX_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/htlbox/makefile.unx b/samples/htlbox/makefile.unx index c8efa59c6e..e821bf345b 100644 --- a/samples/htlbox/makefile.unx +++ b/samples/htlbox/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) htlbox: $(HTLBOX_OBJECTS) - $(CXX) -o $@ $(HTLBOX_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs html,core,base` + $(CXX) -o $@ $(HTLBOX_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs html,core,base` $(LDFLAGS) htlbox_htlbox.o: ./htlbox.cpp $(CXX) -c -o $@ $(HTLBOX_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/htlbox/makefile.vc b/samples/htlbox/makefile.vc index bc9e534e84..3aaf902013 100644 --- a/samples/htlbox/makefile.vc +++ b/samples/htlbox/makefile.vc @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\htlbox.pdb del $(OBJS)\htlbox.pdb $(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\htlbox.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\htlbox.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(HTLBOX_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/htlbox/makefile.wat b/samples/htlbox/makefile.wat index b7fb82c48c..02f7ae2a82 100644 --- a/samples/htlbox/makefile.wat +++ b/samples/htlbox/makefile.wat @@ -256,7 +256,7 @@ $(OBJS)\htlbox.exe : $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res @%append $(OBJS)\htlbox.lbc option quiet @%append $(OBJS)\htlbox.lbc name $^@ @%append $(OBJS)\htlbox.lbc option caseexact - @%append $(OBJS)\htlbox.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\htlbox.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(HTLBOX_OBJECTS)) do @%append $(OBJS)\htlbox.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\htlbox.lbc library %i @%append $(OBJS)\htlbox.lbc option resource=$(OBJS)\htlbox_htlbox.res diff --git a/samples/html/Makefile.in b/samples/html/Makefile.in index d216c12f73..f20c1babad 100644 --- a/samples/html/Makefile.in +++ b/samples/html/Makefile.in @@ -78,6 +78,7 @@ zip: # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d -.PHONY: all install uninstall clean distclean about help helpview printing test virtual widget zip +.PHONY: all install uninstall clean distclean about help helpview printing test \ + virtual widget zip diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in index 8e8cd07181..6985fb5be2 100644 --- a/samples/html/about/Makefile.in +++ b/samples/html/about/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -71,28 +70,20 @@ ABOUT_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__about___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__about___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C about$(EXEEXT) -@COND_PLATFORM_MAC_1@__about___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL about$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___about___os2_emxbindcmd = $(NM) about$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep about$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__about___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___about___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__about_os2_lib_res = \ @@ -133,12 +124,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - about$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -160,8 +145,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc) - $(CXX) -o $@ $(ABOUT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__about___mac_rezcmd) + $(CXX) -o $@ $(ABOUT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__about___mac_setfilecmd) $(__about___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -207,7 +192,16 @@ about_about_rc.o: $(srcdir)/about.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean about_bundle data_files diff --git a/samples/html/about/makefile.bcc b/samples/html/about/makefile.bcc index df2db10352..0b7a516bf2 100644 --- a/samples/html/about/makefile.bcc +++ b/samples/html/about/makefile.bcc @@ -233,7 +233,7 @@ clean: -if exist $(OBJS)\about.ils del $(OBJS)\about.ils $(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_about.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(ABOUT_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\about_about.res | diff --git a/samples/html/about/makefile.gcc b/samples/html/about/makefile.gcc index 5fc68c2ce0..daf6e8194b 100644 --- a/samples/html/about/makefile.gcc +++ b/samples/html/about/makefile.gcc @@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: -if exist $(OBJS)\about.exe del $(OBJS)\about.exe $(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_about_rc.o - $(CXX) -o $@ $(ABOUT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(ABOUT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data_files: if not exist $(OBJS)\data mkdir $(OBJS)\data diff --git a/samples/html/about/makefile.unx b/samples/html/about/makefile.unx index 94f861acf5..0e114547e7 100644 --- a/samples/html/about/makefile.unx +++ b/samples/html/about/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) about: $(ABOUT_OBJECTS) - $(CXX) -o $@ $(ABOUT_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs html,core,base` + $(CXX) -o $@ $(ABOUT_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs html,core,base` $(LDFLAGS) about_about.o: ./about.cpp $(CXX) -c -o $@ $(ABOUT_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/html/about/makefile.vc b/samples/html/about/makefile.vc index 7a774a311b..d1af4f19db 100644 --- a/samples/html/about/makefile.vc +++ b/samples/html/about/makefile.vc @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\about.pdb del $(OBJS)\about.pdb $(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_about.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\about.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\about.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(ABOUT_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/html/about/makefile.wat b/samples/html/about/makefile.wat index 98dce4f8ca..b1ec433699 100644 --- a/samples/html/about/makefile.wat +++ b/samples/html/about/makefile.wat @@ -256,7 +256,7 @@ $(OBJS)\about.exe : $(ABOUT_OBJECTS) $(OBJS)\about_about.res @%append $(OBJS)\about.lbc option quiet @%append $(OBJS)\about.lbc name $^@ @%append $(OBJS)\about.lbc option caseexact - @%append $(OBJS)\about.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\about.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(ABOUT_OBJECTS)) do @%append $(OBJS)\about.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\about.lbc library %i @%append $(OBJS)\about.lbc option resource=$(OBJS)\about_about.res diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in index 92c9ce5d3c..d9ee468e5a 100644 --- a/samples/html/help/Makefile.in +++ b/samples/html/help/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -71,28 +70,20 @@ HTMLHELP_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__htmlhelp___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__htmlhelp___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C htmlhelp$(EXEEXT) -@COND_PLATFORM_MAC_1@__htmlhelp___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL htmlhelp$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___htmlhelp___os2_emxbindcmd = $(NM) htmlhelp$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep htmlhelp$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__htmlhelp___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___htmlhelp___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__htmlhelp_os2_lib_res = \ @@ -133,12 +124,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - htmlhelp$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -160,8 +145,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile htmlhelp$(EXEEXT): $(HTMLHELP_OBJECTS) $(__htmlhelp___win32rc) - $(CXX) -o $@ $(HTMLHELP_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__htmlhelp___mac_rezcmd) + $(CXX) -o $@ $(HTMLHELP_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__htmlhelp___mac_setfilecmd) $(__htmlhelp___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -207,7 +192,16 @@ htmlhelp_help_rc.o: $(srcdir)/help.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean htmlhelp_bundle data diff --git a/samples/html/help/makefile.bcc b/samples/html/help/makefile.bcc index f4249827cd..eeb9cff319 100644 --- a/samples/html/help/makefile.bcc +++ b/samples/html/help/makefile.bcc @@ -233,7 +233,7 @@ clean: -if exist $(OBJS)\htmlhelp.ils del $(OBJS)\htmlhelp.ils $(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(HTMLHELP_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htmlhelp_help.res | diff --git a/samples/html/help/makefile.gcc b/samples/html/help/makefile.gcc index b34f7e44db..dcdfce585d 100644 --- a/samples/html/help/makefile.gcc +++ b/samples/html/help/makefile.gcc @@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: -if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe $(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help_rc.o - $(CXX) -o $@ $(HTMLHELP_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(HTMLHELP_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles diff --git a/samples/html/help/makefile.unx b/samples/html/help/makefile.unx index a1a896c4aa..aa72810637 100644 --- a/samples/html/help/makefile.unx +++ b/samples/html/help/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) htmlhelp: $(HTMLHELP_OBJECTS) - $(CXX) -o $@ $(HTMLHELP_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs html,core,base` + $(CXX) -o $@ $(HTMLHELP_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs html,core,base` $(LDFLAGS) htmlhelp_help.o: ./help.cpp $(CXX) -c -o $@ $(HTMLHELP_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/html/help/makefile.vc b/samples/html/help/makefile.vc index 28bb173a17..bbed48f3c5 100644 --- a/samples/html/help/makefile.vc +++ b/samples/html/help/makefile.vc @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\htmlhelp.pdb del $(OBJS)\htmlhelp.pdb $(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlhelp.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlhelp.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(HTMLHELP_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/html/help/makefile.wat b/samples/html/help/makefile.wat index eb57cfc5fc..65435c17f3 100644 --- a/samples/html/help/makefile.wat +++ b/samples/html/help/makefile.wat @@ -256,7 +256,7 @@ $(OBJS)\htmlhelp.exe : $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res @%append $(OBJS)\htmlhelp.lbc option quiet @%append $(OBJS)\htmlhelp.lbc name $^@ @%append $(OBJS)\htmlhelp.lbc option caseexact - @%append $(OBJS)\htmlhelp.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\htmlhelp.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(HTMLHELP_OBJECTS)) do @%append $(OBJS)\htmlhelp.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\htmlhelp.lbc library %i @%append $(OBJS)\htmlhelp.lbc option resource=$(OBJS)\htmlhelp_help.res diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in index 3fdad62730..25d0f1fa69 100644 --- a/samples/html/helpview/Makefile.in +++ b/samples/html/helpview/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -71,28 +70,20 @@ HELPVIEW_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__helpview___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__helpview___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C helpview$(EXEEXT) -@COND_PLATFORM_MAC_1@__helpview___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL helpview$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___helpview___os2_emxbindcmd = $(NM) helpview$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep helpview$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__helpview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___helpview___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__helpview_os2_lib_res = \ @@ -133,12 +124,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - helpview$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -160,8 +145,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc) - $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__helpview___mac_rezcmd) + $(CXX) -o $@ $(HELPVIEW_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__helpview___mac_setfilecmd) $(__helpview___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -207,7 +192,16 @@ helpview_helpview_rc.o: $(srcdir)/helpview.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean helpview_bundle data diff --git a/samples/html/helpview/makefile.bcc b/samples/html/helpview/makefile.bcc index 3807335dff..ea7bd9179a 100644 --- a/samples/html/helpview/makefile.bcc +++ b/samples/html/helpview/makefile.bcc @@ -233,7 +233,7 @@ clean: -if exist $(OBJS)\helpview.ils del $(OBJS)\helpview.ils $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(HELPVIEW_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\helpview_helpview.res | diff --git a/samples/html/helpview/makefile.gcc b/samples/html/helpview/makefile.gcc index e6337d32a2..2f7ebd01c2 100644 --- a/samples/html/helpview/makefile.gcc +++ b/samples/html/helpview/makefile.gcc @@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview_rc.o - $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/samples/html/helpview/makefile.unx b/samples/html/helpview/makefile.unx index a7707c9605..60584a6c51 100644 --- a/samples/html/helpview/makefile.unx +++ b/samples/html/helpview/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) helpview: $(HELPVIEW_OBJECTS) - $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs html,core,base` + $(CXX) -o $@ $(HELPVIEW_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs html,core,base` $(LDFLAGS) helpview_helpview.o: ./helpview.cpp $(CXX) -c -o $@ $(HELPVIEW_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/html/helpview/makefile.vc b/samples/html/helpview/makefile.vc index 7c022eeb7c..5922891e94 100644 --- a/samples/html/helpview/makefile.vc +++ b/samples/html/helpview/makefile.vc @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\helpview.pdb del $(OBJS)\helpview.pdb $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(HELPVIEW_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/html/helpview/makefile.wat b/samples/html/helpview/makefile.wat index 11f51fffbc..ee9640eedf 100644 --- a/samples/html/helpview/makefile.wat +++ b/samples/html/helpview/makefile.wat @@ -256,7 +256,7 @@ $(OBJS)\helpview.exe : $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res @%append $(OBJS)\helpview.lbc option quiet @%append $(OBJS)\helpview.lbc name $^@ @%append $(OBJS)\helpview.lbc option caseexact - @%append $(OBJS)\helpview.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\helpview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(HELPVIEW_OBJECTS)) do @%append $(OBJS)\helpview.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\helpview.lbc library %i @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_helpview.res diff --git a/samples/html/htmlctrl/Makefile.in b/samples/html/htmlctrl/Makefile.in index f8f8ea45ba..ebb937a156 100644 --- a/samples/html/htmlctrl/Makefile.in +++ b/samples/html/htmlctrl/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ HTMLCTRL_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__htmlctrl___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__htmlctrl___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C htmlctrl$(EXEEXT) -@COND_PLATFORM_MAC_1@__htmlctrl___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL htmlctrl$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___htmlctrl___os2_emxbindcmd = $(NM) htmlctrl$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep htmlctrl$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__htmlctrl___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___htmlctrl___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__htmlctrl___win32rc = htmlctrl_sample_rc.o @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - htmlctrl$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile htmlctrl$(EXEEXT): $(HTMLCTRL_OBJECTS) $(__htmlctrl___win32rc) - $(CXX) -o $@ $(HTMLCTRL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__htmlctrl___mac_rezcmd) + $(CXX) -o $@ $(HTMLCTRL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__htmlctrl___mac_setfilecmd) $(__htmlctrl___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ htmlctrl_htmlctrl.o: $(srcdir)/htmlctrl.cpp $(CXXC) -c -o $@ $(HTMLCTRL_CXXFLAGS) $(srcdir)/htmlctrl.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean htmlctrl_bundle diff --git a/samples/html/htmlctrl/makefile.unx b/samples/html/htmlctrl/makefile.unx index 4594f42731..ae3d4f1089 100644 --- a/samples/html/htmlctrl/makefile.unx +++ b/samples/html/htmlctrl/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) htmlctrl: $(HTMLCTRL_OBJECTS) - $(CXX) -o $@ $(HTMLCTRL_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(HTMLCTRL_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) htmlctrl_htmlctrl.o: ./htmlctrl.cpp $(CXX) -c -o $@ $(HTMLCTRL_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/html/makefile.unx b/samples/html/makefile.unx index 0dff315557..15b41eabf9 100644 --- a/samples/html/makefile.unx +++ b/samples/html/makefile.unx @@ -67,7 +67,8 @@ widget: zip: (cd zip && $(MAKE) all) -.PHONY: all install uninstall clean about help helpview printing test virtual widget zip +.PHONY: all install uninstall clean about help helpview printing test virtual widget \ + zip # Dependencies tracking: diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in index 534d2d837b..9e0d23cc82 100644 --- a/samples/html/printing/Makefile.in +++ b/samples/html/printing/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -71,30 +70,21 @@ HTMLPRINTING_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__htmlprinting___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__htmlprinting___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C htmlprinting$(EXEEXT) -@COND_PLATFORM_MAC_1@__htmlprinting___mac_rezcmd = \ -@COND_PLATFORM_MAC_1@ $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL htmlprinting$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___htmlprinting___os2_emxbindcmd = $(NM) \ htmlprinting$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \ htmlprinting$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__htmlprinting___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___htmlprinting___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__htmlprinting_os2_lib_res = \ @@ -137,12 +127,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - htmlprinting$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -164,8 +148,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile htmlprinting$(EXEEXT): $(HTMLPRINTING_OBJECTS) $(__htmlprinting___win32rc) - $(CXX) -o $@ $(HTMLPRINTING_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__htmlprinting___mac_rezcmd) + $(CXX) -o $@ $(HTMLPRINTING_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__htmlprinting___mac_setfilecmd) $(__htmlprinting___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -211,7 +195,16 @@ htmlprinting_printing_rc.o: $(srcdir)/printing.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean htmlprinting_bundle data diff --git a/samples/html/printing/makefile.bcc b/samples/html/printing/makefile.bcc index be14327b60..876a3cbefe 100644 --- a/samples/html/printing/makefile.bcc +++ b/samples/html/printing/makefile.bcc @@ -233,7 +233,7 @@ clean: -if exist $(OBJS)\htmlprinting.ils del $(OBJS)\htmlprinting.ils $(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(HTMLPRINTING_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htmlprinting_printing.res | diff --git a/samples/html/printing/makefile.gcc b/samples/html/printing/makefile.gcc index 6ae8133c3a..2e2aed16b6 100644 --- a/samples/html/printing/makefile.gcc +++ b/samples/html/printing/makefile.gcc @@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: -if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe $(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing_rc.o - $(CXX) -o $@ $(HTMLPRINTING_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(HTMLPRINTING_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/samples/html/printing/makefile.unx b/samples/html/printing/makefile.unx index f832cbdc37..07fd01a85b 100644 --- a/samples/html/printing/makefile.unx +++ b/samples/html/printing/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) htmlprinting: $(HTMLPRINTING_OBJECTS) - $(CXX) -o $@ $(HTMLPRINTING_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs html,core,base` + $(CXX) -o $@ $(HTMLPRINTING_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs html,core,base` $(LDFLAGS) htmlprinting_printing.o: ./printing.cpp $(CXX) -c -o $@ $(HTMLPRINTING_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/html/printing/makefile.vc b/samples/html/printing/makefile.vc index 1e081ba6f0..e79f40d4d4 100644 --- a/samples/html/printing/makefile.vc +++ b/samples/html/printing/makefile.vc @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\htmlprinting.pdb del $(OBJS)\htmlprinting.pdb $(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlprinting.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlprinting.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(HTMLPRINTING_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/html/printing/makefile.wat b/samples/html/printing/makefile.wat index be7ffe4ea6..f34b38cead 100644 --- a/samples/html/printing/makefile.wat +++ b/samples/html/printing/makefile.wat @@ -256,7 +256,7 @@ $(OBJS)\htmlprinting.exe : $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printin @%append $(OBJS)\htmlprinting.lbc option quiet @%append $(OBJS)\htmlprinting.lbc name $^@ @%append $(OBJS)\htmlprinting.lbc option caseexact - @%append $(OBJS)\htmlprinting.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\htmlprinting.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(HTMLPRINTING_OBJECTS)) do @%append $(OBJS)\htmlprinting.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\htmlprinting.lbc library %i @%append $(OBJS)\htmlprinting.lbc option resource=$(OBJS)\htmlprinting_printing.res diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in index 2aff096a9e..16224b6af5 100644 --- a/samples/html/test/Makefile.in +++ b/samples/html/test/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -71,28 +70,20 @@ TEST_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__test___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__test___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C test$(EXEEXT) -@COND_PLATFORM_MAC_1@__test___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL test$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___test___os2_emxbindcmd = $(NM) test$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep test$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__test___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___test___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__test_os2_lib_res = \ @@ -136,12 +127,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - test$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -163,8 +148,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc) - $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__test___mac_rezcmd) + $(CXX) -o $@ $(TEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__test___mac_setfilecmd) $(__test___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -210,7 +195,16 @@ test_test_rc.o: $(srcdir)/test.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean test_bundle data diff --git a/samples/html/test/makefile.bcc b/samples/html/test/makefile.bcc index 5b11410b2c..1cfc61e6a2 100644 --- a/samples/html/test/makefile.bcc +++ b/samples/html/test/makefile.bcc @@ -237,7 +237,7 @@ clean: -if exist $(OBJS)\test.ils del $(OBJS)\test.ils $(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\test_test.res | diff --git a/samples/html/test/makefile.gcc b/samples/html/test/makefile.gcc index 1697799cfd..2ae6c85255 100644 --- a/samples/html/test/makefile.gcc +++ b/samples/html/test/makefile.gcc @@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -232,7 +232,7 @@ clean: -if exist $(OBJS)\test.exe del $(OBJS)\test.exe $(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test_rc.o - $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(TEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/samples/html/test/makefile.unx b/samples/html/test/makefile.unx index 5a1b289aa9..539a1d565e 100644 --- a/samples/html/test/makefile.unx +++ b/samples/html/test/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) test: $(TEST_OBJECTS) - $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs html,core,net,base` + $(CXX) -o $@ $(TEST_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs html,core,net,base` $(LDFLAGS) test_test.o: ./test.cpp $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/html/test/makefile.vc b/samples/html/test/makefile.vc index 200dbb3d65..abd1be56b1 100644 --- a/samples/html/test/makefile.vc +++ b/samples/html/test/makefile.vc @@ -313,7 +313,7 @@ clean: -if exist $(OBJS)\test.pdb del $(OBJS)\test.pdb $(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\test.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\test.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(TEST_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/html/test/makefile.wat b/samples/html/test/makefile.wat index 37d4afa47a..da48c659c1 100644 --- a/samples/html/test/makefile.wat +++ b/samples/html/test/makefile.wat @@ -261,7 +261,7 @@ $(OBJS)\test.exe : $(TEST_OBJECTS) $(OBJS)\test_test.res @%append $(OBJS)\test.lbc option quiet @%append $(OBJS)\test.lbc name $^@ @%append $(OBJS)\test.lbc option caseexact - @%append $(OBJS)\test.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\test.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\test.lbc library %i @%append $(OBJS)\test.lbc option resource=$(OBJS)\test_test.res diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in index f2c8277aa6..dec9b6504b 100644 --- a/samples/html/virtual/Makefile.in +++ b/samples/html/virtual/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -71,28 +70,20 @@ VIRTUAL_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__virtual___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__virtual___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C virtual$(EXEEXT) -@COND_PLATFORM_MAC_1@__virtual___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL virtual$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___virtual___os2_emxbindcmd = $(NM) virtual$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep virtual$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__virtual___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___virtual___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__virtual_os2_lib_res = \ @@ -133,12 +124,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - virtual$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -160,8 +145,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc) - $(CXX) -o $@ $(VIRTUAL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__virtual___mac_rezcmd) + $(CXX) -o $@ $(VIRTUAL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__virtual___mac_setfilecmd) $(__virtual___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -207,7 +192,16 @@ virtual_virtual_rc.o: $(srcdir)/virtual.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean virtual_bundle data diff --git a/samples/html/virtual/makefile.bcc b/samples/html/virtual/makefile.bcc index 2385eda0b3..b2a587bdf1 100644 --- a/samples/html/virtual/makefile.bcc +++ b/samples/html/virtual/makefile.bcc @@ -233,7 +233,7 @@ clean: -if exist $(OBJS)\virtual.ils del $(OBJS)\virtual.ils $(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(VIRTUAL_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\virtual_virtual.res | diff --git a/samples/html/virtual/makefile.gcc b/samples/html/virtual/makefile.gcc index d4cc76b427..457432005b 100644 --- a/samples/html/virtual/makefile.gcc +++ b/samples/html/virtual/makefile.gcc @@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe $(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual_rc.o - $(CXX) -o $@ $(VIRTUAL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(VIRTUAL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/samples/html/virtual/makefile.unx b/samples/html/virtual/makefile.unx index 5a9c55e439..862a2dba9d 100644 --- a/samples/html/virtual/makefile.unx +++ b/samples/html/virtual/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) virtual: $(VIRTUAL_OBJECTS) - $(CXX) -o $@ $(VIRTUAL_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs html,core,base` + $(CXX) -o $@ $(VIRTUAL_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs html,core,base` $(LDFLAGS) virtual_virtual.o: ./virtual.cpp $(CXX) -c -o $@ $(VIRTUAL_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/html/virtual/makefile.vc b/samples/html/virtual/makefile.vc index 4fd5eacddb..1ecbf663f5 100644 --- a/samples/html/virtual/makefile.vc +++ b/samples/html/virtual/makefile.vc @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\virtual.pdb del $(OBJS)\virtual.pdb $(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\virtual.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\virtual.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(VIRTUAL_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/html/virtual/makefile.wat b/samples/html/virtual/makefile.wat index 97b0d31a44..241f087fdb 100644 --- a/samples/html/virtual/makefile.wat +++ b/samples/html/virtual/makefile.wat @@ -256,7 +256,7 @@ $(OBJS)\virtual.exe : $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res @%append $(OBJS)\virtual.lbc option quiet @%append $(OBJS)\virtual.lbc name $^@ @%append $(OBJS)\virtual.lbc option caseexact - @%append $(OBJS)\virtual.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\virtual.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(VIRTUAL_OBJECTS)) do @%append $(OBJS)\virtual.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\virtual.lbc library %i @%append $(OBJS)\virtual.lbc option resource=$(OBJS)\virtual_virtual.res diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in index 9aaf28b9bb..1ae69cc5d7 100644 --- a/samples/html/widget/Makefile.in +++ b/samples/html/widget/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -71,28 +70,20 @@ WIDGET_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__widget___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__widget___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C widget$(EXEEXT) -@COND_PLATFORM_MAC_1@__widget___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL widget$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___widget___os2_emxbindcmd = $(NM) widget$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep widget$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__widget___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___widget___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__widget_os2_lib_res = \ @@ -133,12 +124,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - widget$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -160,8 +145,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc) - $(CXX) -o $@ $(WIDGET_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__widget___mac_rezcmd) + $(CXX) -o $@ $(WIDGET_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__widget___mac_setfilecmd) $(__widget___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -207,7 +192,16 @@ widget_widget_rc.o: $(srcdir)/widget.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean widget_bundle data diff --git a/samples/html/widget/makefile.bcc b/samples/html/widget/makefile.bcc index 18a3aafa22..cfbd2d9ce5 100644 --- a/samples/html/widget/makefile.bcc +++ b/samples/html/widget/makefile.bcc @@ -233,7 +233,7 @@ clean: -if exist $(OBJS)\widget.ils del $(OBJS)\widget.ils $(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(WIDGET_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\widget_widget.res | diff --git a/samples/html/widget/makefile.gcc b/samples/html/widget/makefile.gcc index afdf6f1866..7c1dbeddd3 100644 --- a/samples/html/widget/makefile.gcc +++ b/samples/html/widget/makefile.gcc @@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe $(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_widget_rc.o - $(CXX) -o $@ $(WIDGET_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(WIDGET_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/samples/html/widget/makefile.unx b/samples/html/widget/makefile.unx index 8cc1946ef8..a42b1ad5c0 100644 --- a/samples/html/widget/makefile.unx +++ b/samples/html/widget/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) widget: $(WIDGET_OBJECTS) - $(CXX) -o $@ $(WIDGET_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs html,core,base` + $(CXX) -o $@ $(WIDGET_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs html,core,base` $(LDFLAGS) widget_widget.o: ./widget.cpp $(CXX) -c -o $@ $(WIDGET_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/html/widget/makefile.vc b/samples/html/widget/makefile.vc index 8db0eee873..69ee88c4cc 100644 --- a/samples/html/widget/makefile.vc +++ b/samples/html/widget/makefile.vc @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\widget.pdb del $(OBJS)\widget.pdb $(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\widget.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\widget.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(WIDGET_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/html/widget/makefile.wat b/samples/html/widget/makefile.wat index 8edce2f8dd..fc10e07a84 100644 --- a/samples/html/widget/makefile.wat +++ b/samples/html/widget/makefile.wat @@ -256,7 +256,7 @@ $(OBJS)\widget.exe : $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res @%append $(OBJS)\widget.lbc option quiet @%append $(OBJS)\widget.lbc name $^@ @%append $(OBJS)\widget.lbc option caseexact - @%append $(OBJS)\widget.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\widget.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(WIDGET_OBJECTS)) do @%append $(OBJS)\widget.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\widget.lbc library %i @%append $(OBJS)\widget.lbc option resource=$(OBJS)\widget_widget.res diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in index dd1fed064c..0711135f0d 100644 --- a/samples/html/zip/Makefile.in +++ b/samples/html/zip/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,21 @@ ZIP_OBJECTS = \ @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__zip___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__zip___mac_setfilecmd = $(SETFILE) -a C zip$(EXEEXT) -@COND_PLATFORM_MAC_1@__zip___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@__zip___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL zip$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___zip___os2_emxbindcmd = $(NM) zip$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep zip$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__zip___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___zip___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__zip_os2_lib_res = \ @@ -132,12 +124,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - zip$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -159,8 +145,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc) - $(CXX) -o $@ $(ZIP_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__zip___mac_rezcmd) + $(CXX) -o $@ $(ZIP_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__zip___mac_setfilecmd) $(__zip___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -206,7 +192,16 @@ zip_zip_rc.o: $(srcdir)/zip.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean zip_bundle data diff --git a/samples/html/zip/makefile.bcc b/samples/html/zip/makefile.bcc index f68189a984..3b330c6006 100644 --- a/samples/html/zip/makefile.bcc +++ b/samples/html/zip/makefile.bcc @@ -233,7 +233,7 @@ clean: -if exist $(OBJS)\zip.ils del $(OBJS)\zip.ils $(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_zip.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(ZIP_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\zip_zip.res | diff --git a/samples/html/zip/makefile.gcc b/samples/html/zip/makefile.gcc index 228a038b7d..8d591a3e83 100644 --- a/samples/html/zip/makefile.gcc +++ b/samples/html/zip/makefile.gcc @@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe $(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_zip_rc.o - $(CXX) -o $@ $(ZIP_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(ZIP_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/samples/html/zip/makefile.unx b/samples/html/zip/makefile.unx index fda1ca5fa2..8049b1ee29 100644 --- a/samples/html/zip/makefile.unx +++ b/samples/html/zip/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) zip: $(ZIP_OBJECTS) - $(CXX) -o $@ $(ZIP_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs html,core,base` + $(CXX) -o $@ $(ZIP_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs html,core,base` $(LDFLAGS) zip_zip.o: ./zip.cpp $(CXX) -c -o $@ $(ZIP_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/html/zip/makefile.vc b/samples/html/zip/makefile.vc index 20034e1574..4e0884b92e 100644 --- a/samples/html/zip/makefile.vc +++ b/samples/html/zip/makefile.vc @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\zip.pdb del $(OBJS)\zip.pdb $(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_zip.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\zip.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\zip.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(ZIP_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/html/zip/makefile.wat b/samples/html/zip/makefile.wat index 2938e93f00..02bad32dd1 100644 --- a/samples/html/zip/makefile.wat +++ b/samples/html/zip/makefile.wat @@ -256,7 +256,7 @@ $(OBJS)\zip.exe : $(ZIP_OBJECTS) $(OBJS)\zip_zip.res @%append $(OBJS)\zip.lbc option quiet @%append $(OBJS)\zip.lbc name $^@ @%append $(OBJS)\zip.lbc option caseexact - @%append $(OBJS)\zip.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\zip.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(ZIP_OBJECTS)) do @%append $(OBJS)\zip.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\zip.lbc library %i @%append $(OBJS)\zip.lbc option resource=$(OBJS)\zip_zip.res diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in index 4447f7eb83..7868fd9acc 100644 --- a/samples/image/Makefile.in +++ b/samples/image/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ IMAGE_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__image___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__image___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C image$(EXEEXT) -@COND_PLATFORM_MAC_1@__image___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL image$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___image___os2_emxbindcmd = $(NM) image$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep image$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__image___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___image___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__image_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - image$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc) - $(CXX) -o $@ $(IMAGE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__image___mac_rezcmd) + $(CXX) -o $@ $(IMAGE_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__image___mac_setfilecmd) $(__image___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -203,7 +188,16 @@ image_image_rc.o: $(srcdir)/image.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean image_bundle data diff --git a/samples/image/makefile.bcc b/samples/image/makefile.bcc index f8aaa26b41..1d79cf77eb 100644 --- a/samples/image/makefile.bcc +++ b/samples/image/makefile.bcc @@ -229,7 +229,7 @@ clean: -if exist $(OBJS)\image.ils del $(OBJS)\image.ils $(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(IMAGE_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\image_image.res | diff --git a/samples/image/makefile.gcc b/samples/image/makefile.gcc index ce4339e236..b6bbcc0aee 100644 --- a/samples/image/makefile.gcc +++ b/samples/image/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\image.exe del $(OBJS)\image.exe $(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image_rc.o - $(CXX) -o $@ $(IMAGE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(IMAGE_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/samples/image/makefile.unx b/samples/image/makefile.unx index 41fcf42a12..ec27760bfc 100644 --- a/samples/image/makefile.unx +++ b/samples/image/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) image: $(IMAGE_OBJECTS) - $(CXX) -o $@ $(IMAGE_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(IMAGE_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) image_image.o: ./image.cpp $(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/image/makefile.vc b/samples/image/makefile.vc index 734acf0c28..746f61b7ec 100644 --- a/samples/image/makefile.vc +++ b/samples/image/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\image.pdb del $(OBJS)\image.pdb $(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\image.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\image.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(IMAGE_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/image/makefile.wat b/samples/image/makefile.wat index 849b308fd6..4359526818 100644 --- a/samples/image/makefile.wat +++ b/samples/image/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\image.exe : $(IMAGE_OBJECTS) $(OBJS)\image_image.res @%append $(OBJS)\image.lbc option quiet @%append $(OBJS)\image.lbc name $^@ @%append $(OBJS)\image.lbc option caseexact - @%append $(OBJS)\image.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\image.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(IMAGE_OBJECTS)) do @%append $(OBJS)\image.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\image.lbc library %i @%append $(OBJS)\image.lbc option resource=$(OBJS)\image_image.res diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in index c2e55547c7..0d5dca9866 100644 --- a/samples/internat/Makefile.in +++ b/samples/internat/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ INTERNAT_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__internat___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__internat___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C internat$(EXEEXT) -@COND_PLATFORM_MAC_1@__internat___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL internat$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___internat___os2_emxbindcmd = $(NM) internat$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep internat$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__internat___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___internat___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__internat_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - internat$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc) - $(CXX) -o $@ $(INTERNAT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__internat___mac_rezcmd) + $(CXX) -o $@ $(INTERNAT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__internat___mac_setfilecmd) $(__internat___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -323,7 +308,17 @@ internat_internat_rc.o: $(srcdir)/internat.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d -.PHONY: all install uninstall clean distclean internat_bundle ar bg cs de fr ka pl ru sv ja ja_JP.EUC-JP +.PHONY: all install uninstall clean distclean internat_bundle ar bg cs de fr ka pl ru sv \ + ja ja_JP.EUC-JP diff --git a/samples/internat/makefile.bcc b/samples/internat/makefile.bcc index 899e371a68..f15c70764f 100644 --- a/samples/internat/makefile.bcc +++ b/samples/internat/makefile.bcc @@ -229,7 +229,7 @@ clean: -if exist $(OBJS)\internat.ils del $(OBJS)\internat.ils $(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(INTERNAT_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\internat_internat.res | diff --git a/samples/internat/makefile.gcc b/samples/internat/makefile.gcc index 34bcbb072b..9b8ed906e5 100644 --- a/samples/internat/makefile.gcc +++ b/samples/internat/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe $(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_internat_rc.o - $(CXX) -o $@ $(INTERNAT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(INTERNAT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 ar: if not exist $(OBJS)\ar mkdir $(OBJS)\ar diff --git a/samples/internat/makefile.unx b/samples/internat/makefile.unx index 0fd281bc22..491fb6935c 100644 --- a/samples/internat/makefile.unx +++ b/samples/internat/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) internat: $(INTERNAT_OBJECTS) - $(CXX) -o $@ $(INTERNAT_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(INTERNAT_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) internat_internat.o: ./internat.cpp $(CXX) -c -o $@ $(INTERNAT_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/internat/makefile.vc b/samples/internat/makefile.vc index 3a0d141905..ba74faf2f9 100644 --- a/samples/internat/makefile.vc +++ b/samples/internat/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\internat.pdb del $(OBJS)\internat.pdb $(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\internat.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\internat.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(INTERNAT_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/internat/makefile.wat b/samples/internat/makefile.wat index 022ec9ba10..4efad5ba22 100644 --- a/samples/internat/makefile.wat +++ b/samples/internat/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\internat.exe : $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res @%append $(OBJS)\internat.lbc option quiet @%append $(OBJS)\internat.lbc name $^@ @%append $(OBJS)\internat.lbc option caseexact - @%append $(OBJS)\internat.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\internat.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(INTERNAT_OBJECTS)) do @%append $(OBJS)\internat.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\internat.lbc library %i @%append $(OBJS)\internat.lbc option resource=$(OBJS)\internat_internat.res diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in index 31ebe42e16..dd5df87b87 100644 --- a/samples/ipc/Makefile.in +++ b/samples/ipc/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -91,8 +90,7 @@ BASEIPCSERVER_OBJECTS = \ @COND_USE_GUI_1@__ipcclient___depname = ipcclient$(EXEEXT) @COND_PLATFORM_MAC_0@__ipcclient___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__ipcclient___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C ipcclient$(EXEEXT) -@COND_PLATFORM_MAC_1@__ipcclient___mac_rezcmd = $(__MACOSX_RESOURCES_p_2) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ipcclient$(EXEEXT) COND_PLATFORM_OS2_1___ipcclient___os2_emxbindcmd = $(NM) ipcclient$(EXEEXT) | \ if grep -q pmwin.763 ; then emxbind -ep ipcclient$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__ipcclient___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___ipcclient___os2_emxbindcmd) @@ -108,8 +106,7 @@ COND_PLATFORM_OS2_1___ipcclient___os2_emxbindcmd = $(NM) ipcclient$(EXEEXT) | \ @COND_USE_GUI_1@__ipcserver___depname = ipcserver$(EXEEXT) @COND_PLATFORM_MAC_0@__ipcserver___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__ipcserver___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C ipcserver$(EXEEXT) -@COND_PLATFORM_MAC_1@__ipcserver___mac_rezcmd = $(__MACOSX_RESOURCES_p_3) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ipcserver$(EXEEXT) COND_PLATFORM_OS2_1___ipcserver___os2_emxbindcmd = $(NM) ipcserver$(EXEEXT) | \ if grep -q pmwin.763 ; then emxbind -ep ipcserver$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__ipcserver___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___ipcserver___os2_emxbindcmd) @@ -128,31 +125,12 @@ COND_PLATFORM_OS2_1___ipcserver___os2_emxbindcmd = $(NM) ipcserver$(EXEEXT) | \ @COND_PLATFORM_MAC_0@__baseipcserver___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__baseipcserver___mac_setfilecmd \ @COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL baseipcserver$(EXEEXT) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) \ - $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_0) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - ipcclient$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_2 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) \ - $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_0) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - ipcserver$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_3 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3) -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = -d __WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_7 = --define __WXUNIVERSAL__ -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_0 = -d wxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_7 = --define wxNO_EXCEPTIONS -@COND_USE_RTTI_0@__RTTI_DEFINE_p_0 = -d wxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_7 = --define wxNO_RTTI -@COND_USE_THREADS_0@__THREAD_DEFINE_p_0 = -d wxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_7 = --define wxNO_THREADS -@COND_SHARED_1@__DLLFLAG_p_0 = -d WXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_7 = --define WXUSINGDLL -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_0 = --include-dir \ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__ +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS +@COND_USE_RTTI_0@__RTTI_DEFINE_p_0 = --define wxNO_RTTI +@COND_USE_THREADS_0@__THREAD_DEFINE_p_0 = --define wxNO_THREADS +@COND_SHARED_1@__DLLFLAG_p_0 = --define WXUSINGDLL +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__ipc = $(top_srcdir)/include/wx/os2/wx.res COND_MONOLITHIC_0___WXLIB_CORE_p = \ @@ -213,8 +191,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile @COND_USE_GUI_1@ipcclient$(EXEEXT): $(IPCCLIENT_OBJECTS) $(__ipcclient___win32rc) -@COND_USE_GUI_1@ $(CXX) -o $@ $(IPCCLIENT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -@COND_USE_GUI_1@ $(__ipcclient___mac_rezcmd) +@COND_USE_GUI_1@ $(CXX) -o $@ $(IPCCLIENT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) +@COND_USE_GUI_1@ @COND_USE_GUI_1@ $(__ipcclient___mac_setfilecmd) @COND_USE_GUI_1@ $(__ipcclient___os2_emxbindcmd) @COND_USE_GUI_1@ $(SAMPLES_RPATH_POSTLINK) @@ -242,8 +220,8 @@ distclean: clean @COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcclient_bundle: $(____ipcclient_BUNDLE_TGT_REF_DEP) @COND_USE_GUI_1@ipcserver$(EXEEXT): $(IPCSERVER_OBJECTS) $(__ipcserver___win32rc) -@COND_USE_GUI_1@ $(CXX) -o $@ $(IPCSERVER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -@COND_USE_GUI_1@ $(__ipcserver___mac_rezcmd) +@COND_USE_GUI_1@ $(CXX) -o $@ $(IPCSERVER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) +@COND_USE_GUI_1@ @COND_USE_GUI_1@ $(__ipcserver___mac_setfilecmd) @COND_USE_GUI_1@ $(__ipcserver___os2_emxbindcmd) @COND_USE_GUI_1@ $(SAMPLES_RPATH_POSTLINK) @@ -271,25 +249,25 @@ distclean: clean @COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcserver_bundle: $(____ipcserver_BUNDLE_TGT_REF_DEP) baseipcclient$(EXEEXT): $(BASEIPCCLIENT_OBJECTS) - $(CXX) -o $@ $(BASEIPCCLIENT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) + $(CXX) -o $@ $(BASEIPCCLIENT_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) $(__baseipcclient___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) baseipcserver$(EXEEXT): $(BASEIPCSERVER_OBJECTS) - $(CXX) -o $@ $(BASEIPCSERVER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) + $(CXX) -o $@ $(BASEIPCSERVER_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) $(__baseipcserver___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) ipcclient_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_7) $(__EXCEPTIONS_DEFINE_p_7) $(__RTTI_DEFINE_p_7) $(__THREAD_DEFINE_p_7) --include-dir $(srcdir) $(__DLLFLAG_p_7) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_0) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include ipcclient_client.o: $(srcdir)/client.cpp $(CXXC) -c -o $@ $(IPCCLIENT_CXXFLAGS) $(srcdir)/client.cpp ipcserver_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_7) $(__EXCEPTIONS_DEFINE_p_7) $(__RTTI_DEFINE_p_7) $(__THREAD_DEFINE_p_7) --include-dir $(srcdir) $(__DLLFLAG_p_7) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_0) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include ipcserver_server.o: $(srcdir)/server.cpp $(CXXC) -c -o $@ $(IPCSERVER_CXXFLAGS) $(srcdir)/server.cpp @@ -301,7 +279,16 @@ baseipcserver_baseserver.o: $(srcdir)/baseserver.cpp $(CXXC) -c -o $@ $(BASEIPCSERVER_CXXFLAGS) $(srcdir)/baseserver.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean ipcclient_bundle ipcserver_bundle diff --git a/samples/ipc/makefile.bcc b/samples/ipc/makefile.bcc index 819e51f050..1b7136f64f 100644 --- a/samples/ipc/makefile.bcc +++ b/samples/ipc/makefile.bcc @@ -282,25 +282,25 @@ clean: !if "$(USE_GUI)" == "1" $(OBJS)\ipcclient.exe: $(IPCCLIENT_OBJECTS) $(OBJS)\ipcclient_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(IPCCLIENT_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\ipcclient_sample.res | !endif !if "$(USE_GUI)" == "1" $(OBJS)\ipcserver.exe: $(IPCSERVER_OBJECTS) $(OBJS)\ipcserver_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(IPCSERVER_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\ipcserver_sample.res | !endif $(OBJS)\baseipcclient.exe: $(BASEIPCCLIENT_OBJECTS) - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&| c0x32.obj $(BASEIPCCLIENT_OBJECTS),$@,, $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, | $(OBJS)\baseipcserver.exe: $(BASEIPCSERVER_OBJECTS) - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&| c0x32.obj $(BASEIPCSERVER_OBJECTS),$@,, $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, | diff --git a/samples/ipc/makefile.gcc b/samples/ipc/makefile.gcc index 09ee006fcd..7043c15d44 100644 --- a/samples/ipc/makefile.gcc +++ b/samples/ipc/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -266,19 +266,19 @@ clean: ifeq ($(USE_GUI),1) $(OBJS)\ipcclient.exe: $(IPCCLIENT_OBJECTS) $(OBJS)\ipcclient_sample_rc.o - $(CXX) -o $@ $(IPCCLIENT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(IPCCLIENT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 endif ifeq ($(USE_GUI),1) $(OBJS)\ipcserver.exe: $(IPCSERVER_OBJECTS) $(OBJS)\ipcserver_sample_rc.o - $(CXX) -o $@ $(IPCSERVER_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(IPCSERVER_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 endif $(OBJS)\baseipcclient.exe: $(BASEIPCCLIENT_OBJECTS) - $(CXX) -o $@ $(BASEIPCCLIENT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(BASEIPCCLIENT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\baseipcserver.exe: $(BASEIPCSERVER_OBJECTS) - $(CXX) -o $@ $(BASEIPCSERVER_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(BASEIPCSERVER_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\ipcclient_sample_rc.o: ./../../samples/sample.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_0) --include-dir ./../../samples --define NOPCH diff --git a/samples/ipc/makefile.unx b/samples/ipc/makefile.unx index 67e91bbab2..2469b1a5a4 100644 --- a/samples/ipc/makefile.unx +++ b/samples/ipc/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -113,16 +113,16 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) ipcclient: $(IPCCLIENT_OBJECTS) - $(CXX) -o $@ $(IPCCLIENT_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,net,base` + $(CXX) -o $@ $(IPCCLIENT_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,net,base` $(LDFLAGS) ipcserver: $(IPCSERVER_OBJECTS) - $(CXX) -o $@ $(IPCSERVER_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,net,base` + $(CXX) -o $@ $(IPCSERVER_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,net,base` $(LDFLAGS) baseipcclient: $(BASEIPCCLIENT_OBJECTS) - $(CXX) -o $@ $(BASEIPCCLIENT_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs net,base` + $(CXX) -o $@ $(BASEIPCCLIENT_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs net,base` $(LDFLAGS) baseipcserver: $(BASEIPCSERVER_OBJECTS) - $(CXX) -o $@ $(BASEIPCSERVER_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs net,base` + $(CXX) -o $@ $(BASEIPCSERVER_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs net,base` $(LDFLAGS) ipcclient_client.o: ./client.cpp $(CXX) -c -o $@ $(IPCCLIENT_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/ipc/makefile.vc b/samples/ipc/makefile.vc index 3b3b05519e..78a488f05f 100644 --- a/samples/ipc/makefile.vc +++ b/samples/ipc/makefile.vc @@ -374,25 +374,25 @@ clean: !if "$(USE_GUI)" == "1" $(OBJS)\ipcclient.exe: $(IPCCLIENT_OBJECTS) $(OBJS)\ipcclient_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_3) /pdb:"$(OBJS)\ipcclient.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /pdb:"$(OBJS)\ipcclient.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(IPCCLIENT_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << !endif !if "$(USE_GUI)" == "1" $(OBJS)\ipcserver.exe: $(IPCSERVER_OBJECTS) $(OBJS)\ipcserver_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_3) /pdb:"$(OBJS)\ipcserver.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /pdb:"$(OBJS)\ipcserver.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(IPCSERVER_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << !endif $(OBJS)\baseipcclient.exe: $(BASEIPCCLIENT_OBJECTS) - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_3) /pdb:"$(OBJS)\baseipcclient.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /pdb:"$(OBJS)\baseipcclient.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< $(BASEIPCCLIENT_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << $(OBJS)\baseipcserver.exe: $(BASEIPCSERVER_OBJECTS) - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_3) /pdb:"$(OBJS)\baseipcserver.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /pdb:"$(OBJS)\baseipcserver.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< $(BASEIPCSERVER_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/ipc/makefile.wat b/samples/ipc/makefile.wat index 48d8149418..1816323a2b 100644 --- a/samples/ipc/makefile.wat +++ b/samples/ipc/makefile.wat @@ -293,7 +293,7 @@ $(OBJS)\ipcclient.exe : $(IPCCLIENT_OBJECTS) $(OBJS)\ipcclient_sample.res @%append $(OBJS)\ipcclient.lbc option quiet @%append $(OBJS)\ipcclient.lbc name $^@ @%append $(OBJS)\ipcclient.lbc option caseexact - @%append $(OBJS)\ipcclient.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\ipcclient.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(IPCCLIENT_OBJECTS)) do @%append $(OBJS)\ipcclient.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\ipcclient.lbc library %i @%append $(OBJS)\ipcclient.lbc option resource=$(OBJS)\ipcclient_sample.res @@ -307,7 +307,7 @@ $(OBJS)\ipcserver.exe : $(IPCSERVER_OBJECTS) $(OBJS)\ipcserver_sample.res @%append $(OBJS)\ipcserver.lbc option quiet @%append $(OBJS)\ipcserver.lbc name $^@ @%append $(OBJS)\ipcserver.lbc option caseexact - @%append $(OBJS)\ipcserver.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\ipcserver.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(IPCSERVER_OBJECTS)) do @%append $(OBJS)\ipcserver.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\ipcserver.lbc library %i @%append $(OBJS)\ipcserver.lbc option resource=$(OBJS)\ipcserver_sample.res @@ -320,7 +320,7 @@ $(OBJS)\baseipcclient.exe : $(BASEIPCCLIENT_OBJECTS) @%append $(OBJS)\baseipcclient.lbc option quiet @%append $(OBJS)\baseipcclient.lbc name $^@ @%append $(OBJS)\baseipcclient.lbc option caseexact - @%append $(OBJS)\baseipcclient.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_' + @%append $(OBJS)\baseipcclient.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) @for %i in ($(BASEIPCCLIENT_OBJECTS)) do @%append $(OBJS)\baseipcclient.lbc file %i @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\baseipcclient.lbc library %i @%append $(OBJS)\baseipcclient.lbc @@ -332,7 +332,7 @@ $(OBJS)\baseipcserver.exe : $(BASEIPCSERVER_OBJECTS) @%append $(OBJS)\baseipcserver.lbc option quiet @%append $(OBJS)\baseipcserver.lbc name $^@ @%append $(OBJS)\baseipcserver.lbc option caseexact - @%append $(OBJS)\baseipcserver.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_' + @%append $(OBJS)\baseipcserver.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) @for %i in ($(BASEIPCSERVER_OBJECTS)) do @%append $(OBJS)\baseipcserver.lbc file %i @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\baseipcserver.lbc library %i @%append $(OBJS)\baseipcserver.lbc diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in index af914adac8..208205696a 100644 --- a/samples/joytest/Makefile.in +++ b/samples/joytest/Makefile.in @@ -146,7 +146,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc) - $(CXX) -o $@ $(JOYTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) + $(CXX) -o $@ $(JOYTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) $(__joytest___mac_setfilecmd) $(__joytest___os2_emxbindcmd) @@ -191,6 +191,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ $(srcdir)/include/wx/stc/stc.h # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean joytest_bundle diff --git a/samples/joytest/makefile.bcc b/samples/joytest/makefile.bcc index 341e0707a0..bbc092a770 100644 --- a/samples/joytest/makefile.bcc +++ b/samples/joytest/makefile.bcc @@ -233,7 +233,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\joytest_joytest.res | diff --git a/samples/joytest/makefile.gcc b/samples/joytest/makefile.gcc index 3703168a78..ef26fdf2d9 100644 --- a/samples/joytest/makefile.gcc +++ b/samples/joytest/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: -if exist $(OBJS)\joytest.exe del $(OBJS)\joytest.exe $(OBJS)\joytest.exe: $(JOYTEST_OBJECTS) $(OBJS)\joytest_joytest_rc.o - $(CXX) -o $@ $(JOYTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(JOYTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\joytest_joytest.o: ./joytest.cpp $(CXX) -c -o $@ $(JOYTEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/joytest/makefile.unx b/samples/joytest/makefile.unx index d6ceb0be44..19fd05520b 100644 --- a/samples/joytest/makefile.unx +++ b/samples/joytest/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) joytest: $(JOYTEST_OBJECTS) - $(CXX) -o $@ $(JOYTEST_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` + $(CXX) -o $@ $(JOYTEST_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` $(LDFLAGS) joytest_joytest.o: ./joytest.cpp $(CXX) -c -o $@ $(JOYTEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/joytest/makefile.vc b/samples/joytest/makefile.vc index e3188e1f85..b6c4dfb713 100644 --- a/samples/joytest/makefile.vc +++ b/samples/joytest/makefile.vc @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\joytest.pdb del $(OBJS)\joytest.pdb $(OBJS)\joytest.exe: $(JOYTEST_OBJECTS) $(OBJS)\joytest_joytest.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\joytest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\joytest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/joytest/makefile.wat b/samples/joytest/makefile.wat index 59d07a8f8e..049926c1ed 100644 --- a/samples/joytest/makefile.wat +++ b/samples/joytest/makefile.wat @@ -256,7 +256,7 @@ $(OBJS)\joytest.exe : $(JOYTEST_OBJECTS) $(OBJS)\joytest_joytest.res @%append $(OBJS)\joytest.lbc option quiet @%append $(OBJS)\joytest.lbc name $^@ @%append $(OBJS)\joytest.lbc option caseexact - @%append $(OBJS)\joytest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\joytest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(JOYTEST_OBJECTS)) do @%append $(OBJS)\joytest.lbc file %i @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\joytest.lbc library %i @%append $(OBJS)\joytest.lbc option resource=$(OBJS)\joytest_joytest.res diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in index e344444f1f..7c8442ec68 100644 --- a/samples/keyboard/Makefile.in +++ b/samples/keyboard/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ KEYBOARD_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__keyboard___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__keyboard___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C keyboard$(EXEEXT) -@COND_PLATFORM_MAC_1@__keyboard___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL keyboard$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___keyboard___os2_emxbindcmd = $(NM) keyboard$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep keyboard$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__keyboard___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___keyboard___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__keyboard_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - keyboard$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc) - $(CXX) -o $@ $(KEYBOARD_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__keyboard___mac_rezcmd) + $(CXX) -o $@ $(KEYBOARD_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__keyboard___mac_setfilecmd) $(__keyboard___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ keyboard_keyboard_rc.o: $(srcdir)/keyboard.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean keyboard_bundle diff --git a/samples/keyboard/makefile.bcc b/samples/keyboard/makefile.bcc index 728873703d..050a793e56 100644 --- a/samples/keyboard/makefile.bcc +++ b/samples/keyboard/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(KEYBOARD_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\keyboard_keyboard.res | diff --git a/samples/keyboard/makefile.gcc b/samples/keyboard/makefile.gcc index 41dd7b0542..d9a0c9a59e 100644 --- a/samples/keyboard/makefile.gcc +++ b/samples/keyboard/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe $(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard_rc.o - $(CXX) -o $@ $(KEYBOARD_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(KEYBOARD_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\keyboard_keyboard.o: ./keyboard.cpp $(CXX) -c -o $@ $(KEYBOARD_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/keyboard/makefile.unx b/samples/keyboard/makefile.unx index 0d9454d36e..71e3f0dec8 100644 --- a/samples/keyboard/makefile.unx +++ b/samples/keyboard/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) keyboard: $(KEYBOARD_OBJECTS) - $(CXX) -o $@ $(KEYBOARD_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(KEYBOARD_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) keyboard_keyboard.o: ./keyboard.cpp $(CXX) -c -o $@ $(KEYBOARD_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/keyboard/makefile.vc b/samples/keyboard/makefile.vc index 369cd32faa..19d4f9b8da 100644 --- a/samples/keyboard/makefile.vc +++ b/samples/keyboard/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\keyboard.pdb del $(OBJS)\keyboard.pdb $(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\keyboard.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\keyboard.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(KEYBOARD_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/keyboard/makefile.wat b/samples/keyboard/makefile.wat index bd120d862f..7a19469e51 100644 --- a/samples/keyboard/makefile.wat +++ b/samples/keyboard/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\keyboard.exe : $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard.res @%append $(OBJS)\keyboard.lbc option quiet @%append $(OBJS)\keyboard.lbc name $^@ @%append $(OBJS)\keyboard.lbc option caseexact - @%append $(OBJS)\keyboard.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\keyboard.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(KEYBOARD_OBJECTS)) do @%append $(OBJS)\keyboard.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\keyboard.lbc library %i @%append $(OBJS)\keyboard.lbc option resource=$(OBJS)\keyboard_keyboard.res diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in index 8a428ee87b..a3314c391e 100644 --- a/samples/layout/Makefile.in +++ b/samples/layout/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ LAYOUT_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__layout___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__layout___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C layout$(EXEEXT) -@COND_PLATFORM_MAC_1@__layout___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL layout$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___layout___os2_emxbindcmd = $(NM) layout$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep layout$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__layout___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___layout___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__layout_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - layout$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc) - $(CXX) -o $@ $(LAYOUT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__layout___mac_rezcmd) + $(CXX) -o $@ $(LAYOUT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__layout___mac_setfilecmd) $(__layout___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ layout_layout_rc.o: $(srcdir)/layout.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean layout_bundle diff --git a/samples/layout/makefile.bcc b/samples/layout/makefile.bcc index 427e0496fd..61214fe291 100644 --- a/samples/layout/makefile.bcc +++ b/samples/layout/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(LAYOUT_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\layout_layout.res | diff --git a/samples/layout/makefile.gcc b/samples/layout/makefile.gcc index 9b6a3aaaa6..09b686e71f 100644 --- a/samples/layout/makefile.gcc +++ b/samples/layout/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe $(OBJS)\layout.exe: $(LAYOUT_OBJECTS) $(OBJS)\layout_layout_rc.o - $(CXX) -o $@ $(LAYOUT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(LAYOUT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\layout_layout.o: ./layout.cpp $(CXX) -c -o $@ $(LAYOUT_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/layout/makefile.unx b/samples/layout/makefile.unx index b2d57e4205..dc84c206ea 100644 --- a/samples/layout/makefile.unx +++ b/samples/layout/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) layout: $(LAYOUT_OBJECTS) - $(CXX) -o $@ $(LAYOUT_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(LAYOUT_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) layout_layout.o: ./layout.cpp $(CXX) -c -o $@ $(LAYOUT_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/layout/makefile.vc b/samples/layout/makefile.vc index c14bea3500..af27654199 100644 --- a/samples/layout/makefile.vc +++ b/samples/layout/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\layout.pdb del $(OBJS)\layout.pdb $(OBJS)\layout.exe: $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\layout.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\layout.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(LAYOUT_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/layout/makefile.wat b/samples/layout/makefile.wat index 9d4e7ec088..c051816be3 100644 --- a/samples/layout/makefile.wat +++ b/samples/layout/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\layout.exe : $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res @%append $(OBJS)\layout.lbc option quiet @%append $(OBJS)\layout.lbc name $^@ @%append $(OBJS)\layout.lbc option caseexact - @%append $(OBJS)\layout.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\layout.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(LAYOUT_OBJECTS)) do @%append $(OBJS)\layout.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\layout.lbc library %i @%append $(OBJS)\layout.lbc option resource=$(OBJS)\layout_layout.res diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in index a7ca6288c8..45dc01a3bf 100644 --- a/samples/listctrl/Makefile.in +++ b/samples/listctrl/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ LISTCTRL_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__listctrl___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__listctrl___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C listctrl$(EXEEXT) -@COND_PLATFORM_MAC_1@__listctrl___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL listctrl$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___listctrl___os2_emxbindcmd = $(NM) listctrl$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep listctrl$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__listctrl___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___listctrl___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__listctrl_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - listctrl$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile listctrl$(EXEEXT): $(LISTCTRL_OBJECTS) $(__listctrl___win32rc) - $(CXX) -o $@ $(LISTCTRL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__listctrl___mac_rezcmd) + $(CXX) -o $@ $(LISTCTRL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__listctrl___mac_setfilecmd) $(__listctrl___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ listctrl_listtest_rc.o: $(srcdir)/listtest.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean listctrl_bundle diff --git a/samples/listctrl/makefile.bcc b/samples/listctrl/makefile.bcc index a12c17003c..b0cfe70332 100644 --- a/samples/listctrl/makefile.bcc +++ b/samples/listctrl/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\listctrl_listtest.res | diff --git a/samples/listctrl/makefile.gcc b/samples/listctrl/makefile.gcc index ab622bdbe4..cb28c67922 100644 --- a/samples/listctrl/makefile.gcc +++ b/samples/listctrl/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\listctrl.exe del $(OBJS)\listctrl.exe $(OBJS)\listctrl.exe: $(LISTCTRL_OBJECTS) $(OBJS)\listctrl_listtest_rc.o - $(CXX) -o $@ $(LISTCTRL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(LISTCTRL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\listctrl_listtest.o: ./listtest.cpp $(CXX) -c -o $@ $(LISTCTRL_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/listctrl/makefile.unx b/samples/listctrl/makefile.unx index eb745ff1b7..5cdacec921 100644 --- a/samples/listctrl/makefile.unx +++ b/samples/listctrl/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) listctrl: $(LISTCTRL_OBJECTS) - $(CXX) -o $@ $(LISTCTRL_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(LISTCTRL_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) listctrl_listtest.o: ./listtest.cpp $(CXX) -c -o $@ $(LISTCTRL_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/listctrl/makefile.vc b/samples/listctrl/makefile.vc index 1761ca5937..ac136f649c 100644 --- a/samples/listctrl/makefile.vc +++ b/samples/listctrl/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\listctrl.pdb del $(OBJS)\listctrl.pdb $(OBJS)\listctrl.exe: $(LISTCTRL_OBJECTS) $(OBJS)\listctrl_listtest.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\listctrl.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\listctrl.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(LISTCTRL_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/listctrl/makefile.wat b/samples/listctrl/makefile.wat index d25e0ef349..dfdfd55cdd 100644 --- a/samples/listctrl/makefile.wat +++ b/samples/listctrl/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\listctrl.exe : $(LISTCTRL_OBJECTS) $(OBJS)\listctrl_listtest.res @%append $(OBJS)\listctrl.lbc option quiet @%append $(OBJS)\listctrl.lbc name $^@ @%append $(OBJS)\listctrl.lbc option caseexact - @%append $(OBJS)\listctrl.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\listctrl.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(LISTCTRL_OBJECTS)) do @%append $(OBJS)\listctrl.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\listctrl.lbc library %i @%append $(OBJS)\listctrl.lbc option resource=$(OBJS)\listctrl_listtest.res diff --git a/samples/makefile.gcc b/samples/makefile.gcc index bf07c8b5a6..63b9041aea 100644 --- a/samples/makefile.gcc +++ b/samples/makefile.gcc @@ -337,7 +337,13 @@ wrapsizer: mfc: $(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) all -.PHONY: all clean access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc +.PHONY: all clean access animate artprov aui calendar caret collpane config combo \ + console controls dataview dialogs dialup display dnd docview docvwmdi dragimag \ + drawing erase event exec except font grid help htlbox html image internat ipc joytest \ + keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg \ + notebook oleauto opengl ownerdrw popup printing regtest render richtext sashtest \ + scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text \ + thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc SHELL := $(COMSPEC) diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in index a48b9fe84b..84255a1fe0 100644 --- a/samples/mdi/Makefile.in +++ b/samples/mdi/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -69,28 +68,21 @@ MDI_OBJECTS = \ @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__mdi___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__mdi___mac_setfilecmd = $(SETFILE) -a C mdi$(EXEEXT) -@COND_PLATFORM_MAC_1@__mdi___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@__mdi___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL mdi$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___mdi___os2_emxbindcmd = $(NM) mdi$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep mdi$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__mdi___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___mdi___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__mdi_os2_lib_res = \ @@ -128,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - mdi$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -155,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile mdi$(EXEEXT): $(MDI_OBJECTS) $(__mdi___win32rc) - $(CXX) -o $@ $(MDI_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__mdi___mac_rezcmd) + $(CXX) -o $@ $(MDI_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__mdi___mac_setfilecmd) $(__mdi___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -190,7 +176,16 @@ mdi_mdi_rc.o: $(srcdir)/mdi.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean mdi_bundle diff --git a/samples/mdi/makefile.bcc b/samples/mdi/makefile.bcc index 436b98dc97..9e18f5cf43 100644 --- a/samples/mdi/makefile.bcc +++ b/samples/mdi/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\mdi_mdi.res | diff --git a/samples/mdi/makefile.gcc b/samples/mdi/makefile.gcc index fb65c354f2..28e2920d5b 100644 --- a/samples/mdi/makefile.gcc +++ b/samples/mdi/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe $(OBJS)\mdi.exe: $(MDI_OBJECTS) $(OBJS)\mdi_mdi_rc.o - $(CXX) -o $@ $(MDI_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(MDI_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\mdi_mdi.o: ./mdi.cpp $(CXX) -c -o $@ $(MDI_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/mdi/makefile.unx b/samples/mdi/makefile.unx index 71d10e960d..0fec4c6731 100644 --- a/samples/mdi/makefile.unx +++ b/samples/mdi/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) mdi: $(MDI_OBJECTS) - $(CXX) -o $@ $(MDI_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(MDI_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) mdi_mdi.o: ./mdi.cpp $(CXX) -c -o $@ $(MDI_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/mdi/makefile.vc b/samples/mdi/makefile.vc index 8f489ce565..e6b95b0d5c 100644 --- a/samples/mdi/makefile.vc +++ b/samples/mdi/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\mdi.pdb del $(OBJS)\mdi.pdb $(OBJS)\mdi.exe: $(MDI_OBJECTS) $(OBJS)\mdi_mdi.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\mdi.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\mdi.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(MDI_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/mdi/makefile.wat b/samples/mdi/makefile.wat index 7897d48801..e040f14b33 100644 --- a/samples/mdi/makefile.wat +++ b/samples/mdi/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\mdi.exe : $(MDI_OBJECTS) $(OBJS)\mdi_mdi.res @%append $(OBJS)\mdi.lbc option quiet @%append $(OBJS)\mdi.lbc name $^@ @%append $(OBJS)\mdi.lbc option caseexact - @%append $(OBJS)\mdi.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\mdi.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(MDI_OBJECTS)) do @%append $(OBJS)\mdi.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\mdi.lbc library %i @%append $(OBJS)\mdi.lbc option resource=$(OBJS)\mdi_mdi.res diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in index 0741b9144c..b9906c6470 100644 --- a/samples/mediaplayer/Makefile.in +++ b/samples/mediaplayer/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -71,29 +70,21 @@ MEDIAPLAYER_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__mediaplayer___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__mediaplayer___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C mediaplayer$(EXEEXT) -@COND_PLATFORM_MAC_1@__mediaplayer___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL mediaplayer$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___mediaplayer___os2_emxbindcmd = $(NM) \ mediaplayer$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \ mediaplayer$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__mediaplayer___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___mediaplayer___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__mediaplayer___win32rc = mediaplayer_sample_rc.o @@ -134,12 +125,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - mediaplayer$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -161,8 +146,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile mediaplayer$(EXEEXT): $(MEDIAPLAYER_OBJECTS) $(__mediaplayer___win32rc) - $(CXX) -o $@ $(MEDIAPLAYER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__mediaplayer___mac_rezcmd) + $(CXX) -o $@ $(MEDIAPLAYER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__mediaplayer___mac_setfilecmd) $(__mediaplayer___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -196,7 +181,16 @@ mediaplayer_mediaplayer.o: $(srcdir)/mediaplayer.cpp $(CXXC) -c -o $@ $(MEDIAPLAYER_CXXFLAGS) $(srcdir)/mediaplayer.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean mediaplayer_bundle diff --git a/samples/mediaplayer/makefile.bcc b/samples/mediaplayer/makefile.bcc index 509bd4b832..f3c909fe50 100644 --- a/samples/mediaplayer/makefile.bcc +++ b/samples/mediaplayer/makefile.bcc @@ -233,7 +233,7 @@ clean: -if exist $(OBJS)\mediaplayer.ils del $(OBJS)\mediaplayer.ils $(OBJS)\mediaplayer.exe: $(MEDIAPLAYER_OBJECTS) $(OBJS)\mediaplayer_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(MEDIAPLAYER_OBJECTS),$@,, $(__WXLIB_MEDIA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\mediaplayer_sample.res | diff --git a/samples/mediaplayer/makefile.gcc b/samples/mediaplayer/makefile.gcc index cccb7d7924..3e02d74377 100644 --- a/samples/mediaplayer/makefile.gcc +++ b/samples/mediaplayer/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -230,7 +230,7 @@ clean: -if exist $(OBJS)\mediaplayer.exe del $(OBJS)\mediaplayer.exe $(OBJS)\mediaplayer.exe: $(MEDIAPLAYER_OBJECTS) $(OBJS)\mediaplayer_sample_rc.o - $(CXX) -o $@ $(MEDIAPLAYER_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_MEDIA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(MEDIAPLAYER_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_MEDIA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\mediaplayer_sample_rc.o: ./../../samples/sample.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH diff --git a/samples/mediaplayer/makefile.unx b/samples/mediaplayer/makefile.unx index 42a1a0dc58..5171233390 100644 --- a/samples/mediaplayer/makefile.unx +++ b/samples/mediaplayer/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) mediaplayer: $(MEDIAPLAYER_OBJECTS) - $(CXX) -o $@ $(MEDIAPLAYER_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs media,core,base` + $(CXX) -o $@ $(MEDIAPLAYER_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs media,core,base` $(LDFLAGS) mediaplayer_mediaplayer.o: ./mediaplayer.cpp $(CXX) -c -o $@ $(MEDIAPLAYER_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/mediaplayer/makefile.vc b/samples/mediaplayer/makefile.vc index a441d350a4..53212ec28a 100644 --- a/samples/mediaplayer/makefile.vc +++ b/samples/mediaplayer/makefile.vc @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\mediaplayer.pdb del $(OBJS)\mediaplayer.pdb $(OBJS)\mediaplayer.exe: $(MEDIAPLAYER_OBJECTS) $(OBJS)\mediaplayer_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\mediaplayer.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\mediaplayer.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(MEDIAPLAYER_OBJECTS) $(__WXLIB_MEDIA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/mediaplayer/makefile.wat b/samples/mediaplayer/makefile.wat index bd873dacf6..904bc1c4e5 100644 --- a/samples/mediaplayer/makefile.wat +++ b/samples/mediaplayer/makefile.wat @@ -258,7 +258,7 @@ $(OBJS)\mediaplayer.exe : $(MEDIAPLAYER_OBJECTS) $(OBJS)\mediaplayer_sample.res @%append $(OBJS)\mediaplayer.lbc option quiet @%append $(OBJS)\mediaplayer.lbc name $^@ @%append $(OBJS)\mediaplayer.lbc option caseexact - @%append $(OBJS)\mediaplayer.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\mediaplayer.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(MEDIAPLAYER_OBJECTS)) do @%append $(OBJS)\mediaplayer.lbc file %i @for %i in ( $(__WXLIB_MEDIA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\mediaplayer.lbc library %i @%append $(OBJS)\mediaplayer.lbc option resource=$(OBJS)\mediaplayer_sample.res diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in index 581ba63af5..67ebf96d09 100644 --- a/samples/memcheck/Makefile.in +++ b/samples/memcheck/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ MEMCHECK_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__memcheck___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__memcheck___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C memcheck$(EXEEXT) -@COND_PLATFORM_MAC_1@__memcheck___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL memcheck$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___memcheck___os2_emxbindcmd = $(NM) memcheck$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep memcheck$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__memcheck___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___memcheck___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__memcheck_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - memcheck$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile memcheck$(EXEEXT): $(MEMCHECK_OBJECTS) $(__memcheck___win32rc) - $(CXX) -o $@ $(MEMCHECK_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__memcheck___mac_rezcmd) + $(CXX) -o $@ $(MEMCHECK_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__memcheck___mac_setfilecmd) $(__memcheck___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ memcheck_memcheck_rc.o: $(srcdir)/memcheck.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean memcheck_bundle diff --git a/samples/memcheck/makefile.bcc b/samples/memcheck/makefile.bcc index 72d9307ee0..1efdfac89e 100644 --- a/samples/memcheck/makefile.bcc +++ b/samples/memcheck/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(MEMCHECK_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\memcheck_memcheck.res | diff --git a/samples/memcheck/makefile.gcc b/samples/memcheck/makefile.gcc index 82246d3a4b..06008c6125 100644 --- a/samples/memcheck/makefile.gcc +++ b/samples/memcheck/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe $(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck_rc.o - $(CXX) -o $@ $(MEMCHECK_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(MEMCHECK_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\memcheck_memcheck.o: ./memcheck.cpp $(CXX) -c -o $@ $(MEMCHECK_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/memcheck/makefile.unx b/samples/memcheck/makefile.unx index 676409f635..f62f8c47bc 100644 --- a/samples/memcheck/makefile.unx +++ b/samples/memcheck/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) memcheck: $(MEMCHECK_OBJECTS) - $(CXX) -o $@ $(MEMCHECK_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(MEMCHECK_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) memcheck_memcheck.o: ./memcheck.cpp $(CXX) -c -o $@ $(MEMCHECK_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/memcheck/makefile.vc b/samples/memcheck/makefile.vc index db77feac04..530dba6987 100644 --- a/samples/memcheck/makefile.vc +++ b/samples/memcheck/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\memcheck.pdb del $(OBJS)\memcheck.pdb $(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\memcheck.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\memcheck.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(MEMCHECK_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/memcheck/makefile.wat b/samples/memcheck/makefile.wat index e8eb379b06..1fab5e99d8 100644 --- a/samples/memcheck/makefile.wat +++ b/samples/memcheck/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\memcheck.exe : $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck.res @%append $(OBJS)\memcheck.lbc option quiet @%append $(OBJS)\memcheck.lbc name $^@ @%append $(OBJS)\memcheck.lbc option caseexact - @%append $(OBJS)\memcheck.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\memcheck.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(MEMCHECK_OBJECTS)) do @%append $(OBJS)\memcheck.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\memcheck.lbc library %i @%append $(OBJS)\memcheck.lbc option resource=$(OBJS)\memcheck_memcheck.res diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in index 15589b1e1b..b357dc2def 100644 --- a/samples/menu/Makefile.in +++ b/samples/menu/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ MENU_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__menu___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__menu___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C menu$(EXEEXT) -@COND_PLATFORM_MAC_1@__menu___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL menu$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___menu___os2_emxbindcmd = $(NM) menu$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep menu$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__menu___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___menu___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__menu_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - menu$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile menu$(EXEEXT): $(MENU_OBJECTS) $(__menu___win32rc) - $(CXX) -o $@ $(MENU_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__menu___mac_rezcmd) + $(CXX) -o $@ $(MENU_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__menu___mac_setfilecmd) $(__menu___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ menu_menu_rc.o: $(srcdir)/menu.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean menu_bundle diff --git a/samples/menu/makefile.bcc b/samples/menu/makefile.bcc index a2106cf7b0..1d5a6dc8df 100644 --- a/samples/menu/makefile.bcc +++ b/samples/menu/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(MENU_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\menu_menu.res | diff --git a/samples/menu/makefile.gcc b/samples/menu/makefile.gcc index 199588622f..5c34375182 100644 --- a/samples/menu/makefile.gcc +++ b/samples/menu/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe $(OBJS)\menu.exe: $(MENU_OBJECTS) $(OBJS)\menu_menu_rc.o - $(CXX) -o $@ $(MENU_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(MENU_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\menu_menu.o: ./menu.cpp $(CXX) -c -o $@ $(MENU_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/menu/makefile.unx b/samples/menu/makefile.unx index 0d935b1985..f83910ff64 100644 --- a/samples/menu/makefile.unx +++ b/samples/menu/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) menu: $(MENU_OBJECTS) - $(CXX) -o $@ $(MENU_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(MENU_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) menu_menu.o: ./menu.cpp $(CXX) -c -o $@ $(MENU_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/menu/makefile.vc b/samples/menu/makefile.vc index 4d89fc3c3a..d0b56a619c 100644 --- a/samples/menu/makefile.vc +++ b/samples/menu/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\menu.pdb del $(OBJS)\menu.pdb $(OBJS)\menu.exe: $(MENU_OBJECTS) $(OBJS)\menu_menu.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\menu.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\menu.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(MENU_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/menu/makefile.wat b/samples/menu/makefile.wat index 49701738df..bba73c3e75 100644 --- a/samples/menu/makefile.wat +++ b/samples/menu/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\menu.exe : $(MENU_OBJECTS) $(OBJS)\menu_menu.res @%append $(OBJS)\menu.lbc option quiet @%append $(OBJS)\menu.lbc name $^@ @%append $(OBJS)\menu.lbc option caseexact - @%append $(OBJS)\menu.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\menu.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(MENU_OBJECTS)) do @%append $(OBJS)\menu.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\menu.lbc library %i @%append $(OBJS)\menu.lbc option resource=$(OBJS)\menu_menu.res diff --git a/samples/mfc/Makefile.in b/samples/mfc/Makefile.in index 3c5095687b..f4d013f04d 100644 --- a/samples/mfc/Makefile.in +++ b/samples/mfc/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ MFCTEST_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__mfctest___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__mfctest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C mfctest$(EXEEXT) -@COND_PLATFORM_MAC_1@__mfctest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL mfctest$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___mfctest___os2_emxbindcmd = $(NM) mfctest$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep mfctest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__mfctest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___mfctest___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__mfctest_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - mfctest$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile mfctest$(EXEEXT): $(MFCTEST_OBJECTS) $(__mfctest___win32rc) - $(CXX) -o $@ $(MFCTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__mfctest___mac_rezcmd) + $(CXX) -o $@ $(MFCTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__mfctest___mac_setfilecmd) $(__mfctest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ mfctest_mfctest_rc.o: $(srcdir)/mfctest.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean mfctest_bundle diff --git a/samples/mfc/makefile.bcc b/samples/mfc/makefile.bcc index 11fb078f4b..2a5006180f 100644 --- a/samples/mfc/makefile.bcc +++ b/samples/mfc/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\mfctest_mfctest.res | diff --git a/samples/mfc/makefile.gcc b/samples/mfc/makefile.gcc index ef389b80fb..56a64cda74 100644 --- a/samples/mfc/makefile.gcc +++ b/samples/mfc/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\mfctest.exe del $(OBJS)\mfctest.exe $(OBJS)\mfctest.exe: $(MFCTEST_OBJECTS) $(OBJS)\mfctest_mfctest_rc.o - $(CXX) -o $@ $(MFCTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(MFCTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\mfctest_mfctest.o: ./mfctest.cpp $(CXX) -c -o $@ $(MFCTEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/mfc/makefile.unx b/samples/mfc/makefile.unx index fbcbb86668..803d885ec2 100644 --- a/samples/mfc/makefile.unx +++ b/samples/mfc/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) mfctest: $(MFCTEST_OBJECTS) - $(CXX) -o $@ $(MFCTEST_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(MFCTEST_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) mfctest_mfctest.o: ./mfctest.cpp $(CXX) -c -o $@ $(MFCTEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/mfc/makefile.vc b/samples/mfc/makefile.vc index 06eb7036c7..ec06b950c0 100644 --- a/samples/mfc/makefile.vc +++ b/samples/mfc/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\mfctest.pdb del $(OBJS)\mfctest.pdb $(OBJS)\mfctest.exe: $(MFCTEST_OBJECTS) $(OBJS)\mfctest_mfctest.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\mfctest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\mfctest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(MFCTEST_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/mfc/makefile.wat b/samples/mfc/makefile.wat index 951049667f..2db6783479 100644 --- a/samples/mfc/makefile.wat +++ b/samples/mfc/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\mfctest.exe : $(MFCTEST_OBJECTS) $(OBJS)\mfctest_mfctest.res @%append $(OBJS)\mfctest.lbc option quiet @%append $(OBJS)\mfctest.lbc name $^@ @%append $(OBJS)\mfctest.lbc option caseexact - @%append $(OBJS)\mfctest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\mfctest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(MFCTEST_OBJECTS)) do @%append $(OBJS)\mfctest.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\mfctest.lbc library %i @%append $(OBJS)\mfctest.lbc option resource=$(OBJS)\mfctest_mfctest.res diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in index d81f179dd7..d769956013 100644 --- a/samples/minimal/Makefile.in +++ b/samples/minimal/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ MINIMAL_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__minimal___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__minimal___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C minimal$(EXEEXT) -@COND_PLATFORM_MAC_1@__minimal___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL minimal$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___minimal___os2_emxbindcmd = $(NM) minimal$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep minimal$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__minimal___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___minimal___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__minimal___win32rc = minimal_sample_rc.o @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - minimal$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc) - $(CXX) -o $@ $(MINIMAL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__minimal___mac_rezcmd) + $(CXX) -o $@ $(MINIMAL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__minimal___mac_setfilecmd) $(__minimal___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ minimal_minimal.o: $(srcdir)/minimal.cpp $(CXXC) -c -o $@ $(MINIMAL_CXXFLAGS) $(srcdir)/minimal.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean minimal_bundle diff --git a/samples/minimal/makefile.bcc b/samples/minimal/makefile.bcc index 4a4bb7128a..b9d6e1b75b 100644 --- a/samples/minimal/makefile.bcc +++ b/samples/minimal/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\minimal_sample.res | diff --git a/samples/minimal/makefile.gcc b/samples/minimal/makefile.gcc index 95dd7816f1..07a80bf781 100644 --- a/samples/minimal/makefile.gcc +++ b/samples/minimal/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\minimal.exe del $(OBJS)\minimal.exe $(OBJS)\minimal.exe: $(MINIMAL_OBJECTS) $(OBJS)\minimal_sample_rc.o - $(CXX) -o $@ $(MINIMAL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(MINIMAL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\minimal_sample_rc.o: ./../../samples/sample.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH diff --git a/samples/minimal/makefile.unx b/samples/minimal/makefile.unx index d9bca5f200..f456f01b76 100644 --- a/samples/minimal/makefile.unx +++ b/samples/minimal/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) minimal: $(MINIMAL_OBJECTS) - $(CXX) -o $@ $(MINIMAL_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(MINIMAL_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) minimal_minimal.o: ./minimal.cpp $(CXX) -c -o $@ $(MINIMAL_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/minimal/makefile.vc b/samples/minimal/makefile.vc index fa8601d609..98195037d6 100644 --- a/samples/minimal/makefile.vc +++ b/samples/minimal/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\minimal.pdb del $(OBJS)\minimal.pdb $(OBJS)\minimal.exe: $(MINIMAL_OBJECTS) $(OBJS)\minimal_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\minimal.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\minimal.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(MINIMAL_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/minimal/makefile.wat b/samples/minimal/makefile.wat index 2d8d98ebad..6c2d2a7f4c 100644 --- a/samples/minimal/makefile.wat +++ b/samples/minimal/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\minimal.exe : $(MINIMAL_OBJECTS) $(OBJS)\minimal_sample.res @%append $(OBJS)\minimal.lbc option quiet @%append $(OBJS)\minimal.lbc name $^@ @%append $(OBJS)\minimal.lbc option caseexact - @%append $(OBJS)\minimal.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\minimal.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(MINIMAL_OBJECTS)) do @%append $(OBJS)\minimal.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\minimal.lbc library %i @%append $(OBJS)\minimal.lbc option resource=$(OBJS)\minimal_sample.res diff --git a/samples/mobile/Makefile.in b/samples/mobile/Makefile.in index ce6a0fb6a7..0277306f7e 100644 --- a/samples/mobile/Makefile.in +++ b/samples/mobile/Makefile.in @@ -48,6 +48,6 @@ wxedit: # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean styles wxedit diff --git a/samples/mobile/styles/Makefile.in b/samples/mobile/styles/Makefile.in index 1b5a84aea0..8f0a055760 100644 --- a/samples/mobile/styles/Makefile.in +++ b/samples/mobile/styles/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ STYLES_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__styles___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__styles___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C styles$(EXEEXT) -@COND_PLATFORM_MAC_1@__styles___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL styles$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___styles___os2_emxbindcmd = $(NM) styles$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep styles$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__styles___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___styles___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__styles___win32rc = styles_sample_rc.o @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - styles$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,13 +141,13 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile styles$(EXEEXT): $(STYLES_OBJECTS) $(__styles___win32rc) - $(CXX) -o $@ $(STYLES_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__styles___mac_rezcmd) + $(CXX) -o $@ $(STYLES_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__styles___mac_setfilecmd) $(__styles___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@styles.app/Contents/PkgInfo: styles$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@styles.app/Contents/PkgInfo: styles$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p styles.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p styles.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p styles.app/Contents/Resources @@ -171,7 +156,7 @@ styles$(EXEEXT): $(STYLES_OBJECTS) $(__styles___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/styles/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >styles.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >styles.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >styles.app/Contents/PkgInfo @@ -180,7 +165,7 @@ styles$(EXEEXT): $(STYLES_OBJECTS) $(__styles___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f styles$(EXEEXT) styles.app/Contents/MacOS/styles @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns styles.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns styles.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@styles_bundle: $(____styles_BUNDLE_TGT_REF_DEP) @@ -203,7 +188,16 @@ styles_styles.o: $(srcdir)/styles.cpp $(CXXC) -c -o $@ $(STYLES_CXXFLAGS) $(srcdir)/styles.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean styles_bundle data diff --git a/samples/mobile/styles/makefile.bcc b/samples/mobile/styles/makefile.bcc index aa0666551e..7d13499a8d 100644 --- a/samples/mobile/styles/makefile.bcc +++ b/samples/mobile/styles/makefile.bcc @@ -229,7 +229,7 @@ clean: -if exist $(OBJS)\styles.ils del $(OBJS)\styles.ils $(OBJS)\styles.exe: $(STYLES_OBJECTS) $(OBJS)\styles_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\styles_sample.res | diff --git a/samples/mobile/styles/makefile.gcc b/samples/mobile/styles/makefile.gcc index 53cd821372..a6436c9401 100644 --- a/samples/mobile/styles/makefile.gcc +++ b/samples/mobile/styles/makefile.gcc @@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\styles.exe del $(OBJS)\styles.exe $(OBJS)\styles.exe: $(STYLES_OBJECTS) $(OBJS)\styles_sample_rc.o - $(CXX) -o $@ $(STYLES_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(STYLES_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/samples/mobile/styles/makefile.unx b/samples/mobile/styles/makefile.unx index 71092adb0d..3e49cd3e98 100644 --- a/samples/mobile/styles/makefile.unx +++ b/samples/mobile/styles/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) styles: $(STYLES_OBJECTS) - $(CXX) -o $@ $(STYLES_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(STYLES_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) styles_styles.o: ./styles.cpp $(CXX) -c -o $@ $(STYLES_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/mobile/styles/makefile.vc b/samples/mobile/styles/makefile.vc index d33aba7af3..0478163d12 100644 --- a/samples/mobile/styles/makefile.vc +++ b/samples/mobile/styles/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\styles.pdb del $(OBJS)\styles.pdb $(OBJS)\styles.exe: $(STYLES_OBJECTS) $(OBJS)\styles_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\styles.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\styles.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(STYLES_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/mobile/styles/makefile.wat b/samples/mobile/styles/makefile.wat index 1709e93a3d..3f320f40a6 100644 --- a/samples/mobile/styles/makefile.wat +++ b/samples/mobile/styles/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\styles.exe : $(STYLES_OBJECTS) $(OBJS)\styles_sample.res @%append $(OBJS)\styles.lbc option quiet @%append $(OBJS)\styles.lbc name $^@ @%append $(OBJS)\styles.lbc option caseexact - @%append $(OBJS)\styles.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\styles.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(STYLES_OBJECTS)) do @%append $(OBJS)\styles.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\styles.lbc library %i @%append $(OBJS)\styles.lbc option resource=$(OBJS)\styles_sample.res diff --git a/samples/mobile/wxedit/Makefile.in b/samples/mobile/wxedit/Makefile.in index 0e7e14eed8..9a4993c892 100644 --- a/samples/mobile/wxedit/Makefile.in +++ b/samples/mobile/wxedit/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ WXEDIT_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__wxedit___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__wxedit___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C wxedit$(EXEEXT) -@COND_PLATFORM_MAC_1@__wxedit___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL wxedit$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___wxedit___os2_emxbindcmd = $(NM) wxedit$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep wxedit$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__wxedit___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___wxedit___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__wxedit___win32rc = wxedit_sample_rc.o @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - wxedit$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,13 +141,13 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile wxedit$(EXEEXT): $(WXEDIT_OBJECTS) $(__wxedit___win32rc) - $(CXX) -o $@ $(WXEDIT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__wxedit___mac_rezcmd) + $(CXX) -o $@ $(WXEDIT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__wxedit___mac_setfilecmd) $(__wxedit___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@wxedit.app/Contents/PkgInfo: wxedit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@wxedit.app/Contents/PkgInfo: wxedit$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p wxedit.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p wxedit.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p wxedit.app/Contents/Resources @@ -171,7 +156,7 @@ wxedit$(EXEEXT): $(WXEDIT_OBJECTS) $(__wxedit___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/wxedit/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >wxedit.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >wxedit.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >wxedit.app/Contents/PkgInfo @@ -180,7 +165,7 @@ wxedit$(EXEEXT): $(WXEDIT_OBJECTS) $(__wxedit___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f wxedit$(EXEEXT) wxedit.app/Contents/MacOS/wxedit @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns wxedit.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns wxedit.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@wxedit_bundle: $(____wxedit_BUNDLE_TGT_REF_DEP) @@ -191,7 +176,16 @@ wxedit_wxedit.o: $(srcdir)/wxedit.cpp $(CXXC) -c -o $@ $(WXEDIT_CXXFLAGS) $(srcdir)/wxedit.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean wxedit_bundle diff --git a/samples/mobile/wxedit/makefile.bcc b/samples/mobile/wxedit/makefile.bcc index df33cd33c9..1363d27d72 100644 --- a/samples/mobile/wxedit/makefile.bcc +++ b/samples/mobile/wxedit/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wxedit_sample.res | diff --git a/samples/mobile/wxedit/makefile.gcc b/samples/mobile/wxedit/makefile.gcc index ea0ddae72b..4d5062b52c 100644 --- a/samples/mobile/wxedit/makefile.gcc +++ b/samples/mobile/wxedit/makefile.gcc @@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\wxedit.exe del $(OBJS)\wxedit.exe $(OBJS)\wxedit.exe: $(WXEDIT_OBJECTS) $(OBJS)\wxedit_sample_rc.o - $(CXX) -o $@ $(WXEDIT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(WXEDIT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\wxedit_sample_rc.o: ./../../../samples/sample.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH diff --git a/samples/mobile/wxedit/makefile.unx b/samples/mobile/wxedit/makefile.unx index 040126846d..e052371b04 100644 --- a/samples/mobile/wxedit/makefile.unx +++ b/samples/mobile/wxedit/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) wxedit: $(WXEDIT_OBJECTS) - $(CXX) -o $@ $(WXEDIT_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(WXEDIT_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) wxedit_wxedit.o: ./wxedit.cpp $(CXX) -c -o $@ $(WXEDIT_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/mobile/wxedit/makefile.vc b/samples/mobile/wxedit/makefile.vc index ab2e6e88de..79016a7787 100644 --- a/samples/mobile/wxedit/makefile.vc +++ b/samples/mobile/wxedit/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\wxedit.pdb del $(OBJS)\wxedit.pdb $(OBJS)\wxedit.exe: $(WXEDIT_OBJECTS) $(OBJS)\wxedit_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxedit.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxedit.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(WXEDIT_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/mobile/wxedit/makefile.wat b/samples/mobile/wxedit/makefile.wat index 54678979e6..167fc124db 100644 --- a/samples/mobile/wxedit/makefile.wat +++ b/samples/mobile/wxedit/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\wxedit.exe : $(WXEDIT_OBJECTS) $(OBJS)\wxedit_sample.res @%append $(OBJS)\wxedit.lbc option quiet @%append $(OBJS)\wxedit.lbc name $^@ @%append $(OBJS)\wxedit.lbc option caseexact - @%append $(OBJS)\wxedit.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\wxedit.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(WXEDIT_OBJECTS)) do @%append $(OBJS)\wxedit.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\wxedit.lbc library %i @%append $(OBJS)\wxedit.lbc option resource=$(OBJS)\wxedit_sample.res diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in index 0dd7039eff..db89e9d500 100644 --- a/samples/nativdlg/Makefile.in +++ b/samples/nativdlg/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ NATIVDLG_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__nativdlg___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__nativdlg___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C nativdlg$(EXEEXT) -@COND_PLATFORM_MAC_1@__nativdlg___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL nativdlg$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___nativdlg___os2_emxbindcmd = $(NM) nativdlg$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep nativdlg$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__nativdlg___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___nativdlg___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__nativdlg_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - nativdlg$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile nativdlg$(EXEEXT): $(NATIVDLG_OBJECTS) $(__nativdlg___win32rc) - $(CXX) -o $@ $(NATIVDLG_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__nativdlg___mac_rezcmd) + $(CXX) -o $@ $(NATIVDLG_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__nativdlg___mac_setfilecmd) $(__nativdlg___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ nativdlg_nativdlg_rc.o: $(srcdir)/nativdlg.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean nativdlg_bundle diff --git a/samples/nativdlg/makefile.bcc b/samples/nativdlg/makefile.bcc index 35de4e5881..cbc22a7ed1 100644 --- a/samples/nativdlg/makefile.bcc +++ b/samples/nativdlg/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\nativdlg_nativdlg.res | diff --git a/samples/nativdlg/makefile.gcc b/samples/nativdlg/makefile.gcc index 0a2071842d..3e009c4c56 100644 --- a/samples/nativdlg/makefile.gcc +++ b/samples/nativdlg/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\nativdlg.exe del $(OBJS)\nativdlg.exe $(OBJS)\nativdlg.exe: $(NATIVDLG_OBJECTS) $(OBJS)\nativdlg_nativdlg_rc.o - $(CXX) -o $@ $(NATIVDLG_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(NATIVDLG_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\nativdlg_nativdlg.o: ./nativdlg.cpp $(CXX) -c -o $@ $(NATIVDLG_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/nativdlg/makefile.unx b/samples/nativdlg/makefile.unx index 7eba7b765a..6bf9fa07b8 100644 --- a/samples/nativdlg/makefile.unx +++ b/samples/nativdlg/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) nativdlg: $(NATIVDLG_OBJECTS) - $(CXX) -o $@ $(NATIVDLG_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(NATIVDLG_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) nativdlg_nativdlg.o: ./nativdlg.cpp $(CXX) -c -o $@ $(NATIVDLG_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/nativdlg/makefile.vc b/samples/nativdlg/makefile.vc index 73169f690b..4904ad494f 100644 --- a/samples/nativdlg/makefile.vc +++ b/samples/nativdlg/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\nativdlg.pdb del $(OBJS)\nativdlg.pdb $(OBJS)\nativdlg.exe: $(NATIVDLG_OBJECTS) $(OBJS)\nativdlg_nativdlg.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\nativdlg.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\nativdlg.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(NATIVDLG_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/nativdlg/makefile.wat b/samples/nativdlg/makefile.wat index 76bf3a6c58..295946398d 100644 --- a/samples/nativdlg/makefile.wat +++ b/samples/nativdlg/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\nativdlg.exe : $(NATIVDLG_OBJECTS) $(OBJS)\nativdlg_nativdlg.res @%append $(OBJS)\nativdlg.lbc option quiet @%append $(OBJS)\nativdlg.lbc name $^@ @%append $(OBJS)\nativdlg.lbc option caseexact - @%append $(OBJS)\nativdlg.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\nativdlg.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(NATIVDLG_OBJECTS)) do @%append $(OBJS)\nativdlg.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\nativdlg.lbc library %i @%append $(OBJS)\nativdlg.lbc option resource=$(OBJS)\nativdlg_nativdlg.res diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in index 413ca5574c..f3c6714647 100644 --- a/samples/notebook/Makefile.in +++ b/samples/notebook/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ NOTEBOOK_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__notebook___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__notebook___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C notebook$(EXEEXT) -@COND_PLATFORM_MAC_1@__notebook___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL notebook$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___notebook___os2_emxbindcmd = $(NM) notebook$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep notebook$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__notebook___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___notebook___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__notebook___win32rc = notebook_sample_rc.o @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - notebook$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile notebook$(EXEEXT): $(NOTEBOOK_OBJECTS) $(__notebook___win32rc) - $(CXX) -o $@ $(NOTEBOOK_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__notebook___mac_rezcmd) + $(CXX) -o $@ $(NOTEBOOK_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__notebook___mac_setfilecmd) $(__notebook___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ notebook_notebook.o: $(srcdir)/notebook.cpp $(CXXC) -c -o $@ $(NOTEBOOK_CXXFLAGS) $(srcdir)/notebook.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean notebook_bundle diff --git a/samples/notebook/makefile.bcc b/samples/notebook/makefile.bcc index f7a6b2cdb5..8a885a638c 100644 --- a/samples/notebook/makefile.bcc +++ b/samples/notebook/makefile.bcc @@ -229,7 +229,7 @@ clean: -if exist $(OBJS)\notebook.ils del $(OBJS)\notebook.ils $(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\notebook_sample.res | diff --git a/samples/notebook/makefile.gcc b/samples/notebook/makefile.gcc index f87e7b8adf..9295805a71 100644 --- a/samples/notebook/makefile.gcc +++ b/samples/notebook/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\notebook.exe del $(OBJS)\notebook.exe $(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample_rc.o - $(CXX) -o $@ $(NOTEBOOK_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(NOTEBOOK_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\notebook_sample_rc.o: ./../../samples/sample.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH diff --git a/samples/notebook/makefile.unx b/samples/notebook/makefile.unx index 6dac5712ab..9c27d85954 100644 --- a/samples/notebook/makefile.unx +++ b/samples/notebook/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) notebook: $(NOTEBOOK_OBJECTS) - $(CXX) -o $@ $(NOTEBOOK_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(NOTEBOOK_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) notebook_notebook.o: ./notebook.cpp $(CXX) -c -o $@ $(NOTEBOOK_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/notebook/makefile.vc b/samples/notebook/makefile.vc index 5fa9b25a8a..c47c31fcf8 100644 --- a/samples/notebook/makefile.vc +++ b/samples/notebook/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\notebook.pdb del $(OBJS)\notebook.pdb $(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\notebook.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\notebook.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(NOTEBOOK_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/notebook/makefile.wat b/samples/notebook/makefile.wat index 1b834cd24f..a6d57340d3 100644 --- a/samples/notebook/makefile.wat +++ b/samples/notebook/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\notebook.exe : $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample.res @%append $(OBJS)\notebook.lbc option quiet @%append $(OBJS)\notebook.lbc name $^@ @%append $(OBJS)\notebook.lbc option caseexact - @%append $(OBJS)\notebook.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\notebook.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(NOTEBOOK_OBJECTS)) do @%append $(OBJS)\notebook.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\notebook.lbc library %i @%append $(OBJS)\notebook.lbc option resource=$(OBJS)\notebook_sample.res diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in index 1b61f0e1c4..1e0c839966 100644 --- a/samples/oleauto/Makefile.in +++ b/samples/oleauto/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ OLEAUTO_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__oleauto___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__oleauto___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C oleauto$(EXEEXT) -@COND_PLATFORM_MAC_1@__oleauto___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL oleauto$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___oleauto___os2_emxbindcmd = $(NM) oleauto$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep oleauto$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__oleauto___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___oleauto___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__oleauto_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - oleauto$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile oleauto$(EXEEXT): $(OLEAUTO_OBJECTS) $(__oleauto___win32rc) - $(CXX) -o $@ $(OLEAUTO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__oleauto___mac_rezcmd) + $(CXX) -o $@ $(OLEAUTO_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__oleauto___mac_setfilecmd) $(__oleauto___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ oleauto_oleauto_rc.o: $(srcdir)/oleauto.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean oleauto_bundle diff --git a/samples/oleauto/makefile.bcc b/samples/oleauto/makefile.bcc index 2a8cdea5ff..982c2d996d 100644 --- a/samples/oleauto/makefile.bcc +++ b/samples/oleauto/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(OLEAUTO_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\oleauto_oleauto.res | diff --git a/samples/oleauto/makefile.gcc b/samples/oleauto/makefile.gcc index e1f3441edc..973a744bb6 100644 --- a/samples/oleauto/makefile.gcc +++ b/samples/oleauto/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe $(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto_rc.o - $(CXX) -o $@ $(OLEAUTO_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(OLEAUTO_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\oleauto_oleauto.o: ./oleauto.cpp $(CXX) -c -o $@ $(OLEAUTO_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/oleauto/makefile.unx b/samples/oleauto/makefile.unx index 934492bbcc..08ada2ab0d 100644 --- a/samples/oleauto/makefile.unx +++ b/samples/oleauto/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) oleauto: $(OLEAUTO_OBJECTS) - $(CXX) -o $@ $(OLEAUTO_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(OLEAUTO_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) oleauto_oleauto.o: ./oleauto.cpp $(CXX) -c -o $@ $(OLEAUTO_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/oleauto/makefile.vc b/samples/oleauto/makefile.vc index 5ed8cc6851..45c639a2b6 100644 --- a/samples/oleauto/makefile.vc +++ b/samples/oleauto/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\oleauto.pdb del $(OBJS)\oleauto.pdb $(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\oleauto.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\oleauto.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(OLEAUTO_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/oleauto/makefile.wat b/samples/oleauto/makefile.wat index 102c444372..3b21da8553 100644 --- a/samples/oleauto/makefile.wat +++ b/samples/oleauto/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\oleauto.exe : $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto.res @%append $(OBJS)\oleauto.lbc option quiet @%append $(OBJS)\oleauto.lbc name $^@ @%append $(OBJS)\oleauto.lbc option caseexact - @%append $(OBJS)\oleauto.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\oleauto.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(OLEAUTO_OBJECTS)) do @%append $(OBJS)\oleauto.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\oleauto.lbc library %i @%append $(OBJS)\oleauto.lbc option resource=$(OBJS)\oleauto_oleauto.res diff --git a/samples/opengl/Makefile.in b/samples/opengl/Makefile.in index 5f8b510719..092ed69cdb 100644 --- a/samples/opengl/Makefile.in +++ b/samples/opengl/Makefile.in @@ -53,6 +53,6 @@ penguin: # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean cube isosurf penguin diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in index a7c2a8cdde..c0ef7b652e 100644 --- a/samples/opengl/cube/Makefile.in +++ b/samples/opengl/cube/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -72,28 +71,20 @@ CUBE_OBJECTS = \ @COND_USE_OPENGL_1@__cube___depname = cube$(EXEEXT) @COND_PLATFORM_MAC_0@__cube___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__cube___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C cube$(EXEEXT) -@COND_PLATFORM_MAC_1@__cube___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL cube$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___cube___os2_emxbindcmd = $(NM) cube$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep cube$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__cube___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___cube___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__cube_os2_lib_res = \ @@ -131,12 +122,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - cube$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -158,8 +143,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile @COND_USE_OPENGL_1@cube$(EXEEXT): $(CUBE_OBJECTS) $(__cube___win32rc) -@COND_USE_OPENGL_1@ $(CXX) -o $@ $(CUBE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -@COND_USE_OPENGL_1@ $(__cube___mac_rezcmd) +@COND_USE_OPENGL_1@ $(CXX) -o $@ $(CUBE_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) +@COND_USE_OPENGL_1@ @COND_USE_OPENGL_1@ $(__cube___mac_setfilecmd) @COND_USE_OPENGL_1@ $(__cube___os2_emxbindcmd) @COND_USE_OPENGL_1@ $(SAMPLES_RPATH_POSTLINK) @@ -193,7 +178,16 @@ cube_cube_rc.o: $(srcdir)/cube.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean cube_bundle diff --git a/samples/opengl/cube/makefile.bcc b/samples/opengl/cube/makefile.bcc index a75d07ecd8..83183eb01e 100644 --- a/samples/opengl/cube/makefile.bcc +++ b/samples/opengl/cube/makefile.bcc @@ -233,7 +233,7 @@ clean: !if "$(USE_OPENGL)" == "1" $(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_cube.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(CUBE_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\cube_cube.res | !endif diff --git a/samples/opengl/cube/makefile.gcc b/samples/opengl/cube/makefile.gcc index 2eebac764d..9bcc04484d 100644 --- a/samples/opengl/cube/makefile.gcc +++ b/samples/opengl/cube/makefile.gcc @@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: ifeq ($(USE_OPENGL),1) $(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_cube_rc.o - $(CXX) -o $@ $(CUBE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(CUBE_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 endif $(OBJS)\cube_cube.o: ./cube.cpp diff --git a/samples/opengl/cube/makefile.unx b/samples/opengl/cube/makefile.unx index 038635b86d..0d913b9a7e 100644 --- a/samples/opengl/cube/makefile.unx +++ b/samples/opengl/cube/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) cube: $(CUBE_OBJECTS) - $(CXX) -o $@ $(CUBE_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs gl,core,base` + $(CXX) -o $@ $(CUBE_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs gl,core,base` $(LDFLAGS) cube_cube.o: ./cube.cpp $(CXX) -c -o $@ $(CUBE_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/opengl/cube/makefile.vc b/samples/opengl/cube/makefile.vc index c77862bb19..1bf7aa630b 100644 --- a/samples/opengl/cube/makefile.vc +++ b/samples/opengl/cube/makefile.vc @@ -309,7 +309,7 @@ clean: !if "$(USE_OPENGL)" == "1" $(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_cube.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\cube.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\cube.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(CUBE_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << !endif diff --git a/samples/opengl/cube/makefile.wat b/samples/opengl/cube/makefile.wat index 1761989311..aaf9692780 100644 --- a/samples/opengl/cube/makefile.wat +++ b/samples/opengl/cube/makefile.wat @@ -256,7 +256,7 @@ $(OBJS)\cube.exe : $(CUBE_OBJECTS) $(OBJS)\cube_cube.res @%append $(OBJS)\cube.lbc option quiet @%append $(OBJS)\cube.lbc name $^@ @%append $(OBJS)\cube.lbc option caseexact - @%append $(OBJS)\cube.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\cube.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(CUBE_OBJECTS)) do @%append $(OBJS)\cube.lbc file %i @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\cube.lbc library %i @%append $(OBJS)\cube.lbc option resource=$(OBJS)\cube_cube.res diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in index bcf898ee82..dbd786b0d9 100644 --- a/samples/opengl/isosurf/Makefile.in +++ b/samples/opengl/isosurf/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -72,28 +71,20 @@ ISOSURF_OBJECTS = \ @COND_USE_OPENGL_1@__isosurf___depname = isosurf$(EXEEXT) @COND_PLATFORM_MAC_0@__isosurf___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__isosurf___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C isosurf$(EXEEXT) -@COND_PLATFORM_MAC_1@__isosurf___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL isosurf$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___isosurf___os2_emxbindcmd = $(NM) isosurf$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep isosurf$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__isosurf___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___isosurf___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__isosurf___win32rc = isosurf_sample_rc.o @@ -132,12 +123,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - isosurf$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -159,8 +144,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile @COND_USE_OPENGL_1@isosurf$(EXEEXT): $(ISOSURF_OBJECTS) $(__isosurf___win32rc) -@COND_USE_OPENGL_1@ $(CXX) -o $@ $(ISOSURF_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -@COND_USE_OPENGL_1@ $(__isosurf___mac_rezcmd) +@COND_USE_OPENGL_1@ $(CXX) -o $@ $(ISOSURF_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) +@COND_USE_OPENGL_1@ @COND_USE_OPENGL_1@ $(__isosurf___mac_setfilecmd) @COND_USE_OPENGL_1@ $(__isosurf___os2_emxbindcmd) @COND_USE_OPENGL_1@ $(SAMPLES_RPATH_POSTLINK) @@ -206,7 +191,16 @@ isosurf_isosurf.o: $(srcdir)/isosurf.cpp $(CXXC) -c -o $@ $(ISOSURF_CXXFLAGS) $(srcdir)/isosurf.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean isosurf_bundle data diff --git a/samples/opengl/isosurf/makefile.bcc b/samples/opengl/isosurf/makefile.bcc index ecb42b0271..2bb82b341f 100644 --- a/samples/opengl/isosurf/makefile.bcc +++ b/samples/opengl/isosurf/makefile.bcc @@ -233,7 +233,7 @@ clean: !if "$(USE_OPENGL)" == "1" $(OBJS)\isosurf.exe: $(ISOSURF_OBJECTS) $(OBJS)\isosurf_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(ISOSURF_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\isosurf_sample.res | !endif diff --git a/samples/opengl/isosurf/makefile.gcc b/samples/opengl/isosurf/makefile.gcc index 961d3de696..f2c5c8ad58 100644 --- a/samples/opengl/isosurf/makefile.gcc +++ b/samples/opengl/isosurf/makefile.gcc @@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: ifeq ($(USE_OPENGL),1) $(OBJS)\isosurf.exe: $(ISOSURF_OBJECTS) $(OBJS)\isosurf_sample_rc.o - $(CXX) -o $@ $(ISOSURF_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(ISOSURF_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 endif data: diff --git a/samples/opengl/isosurf/makefile.unx b/samples/opengl/isosurf/makefile.unx index 317dd8efba..dc37bb37f2 100644 --- a/samples/opengl/isosurf/makefile.unx +++ b/samples/opengl/isosurf/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) isosurf: $(ISOSURF_OBJECTS) - $(CXX) -o $@ $(ISOSURF_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs gl,core,base` + $(CXX) -o $@ $(ISOSURF_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs gl,core,base` $(LDFLAGS) isosurf_isosurf.o: ./isosurf.cpp $(CXX) -c -o $@ $(ISOSURF_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/opengl/isosurf/makefile.vc b/samples/opengl/isosurf/makefile.vc index f29e27dab2..15ffe167e0 100644 --- a/samples/opengl/isosurf/makefile.vc +++ b/samples/opengl/isosurf/makefile.vc @@ -309,7 +309,7 @@ clean: !if "$(USE_OPENGL)" == "1" $(OBJS)\isosurf.exe: $(ISOSURF_OBJECTS) $(OBJS)\isosurf_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\isosurf.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\isosurf.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(ISOSURF_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << !endif diff --git a/samples/opengl/isosurf/makefile.wat b/samples/opengl/isosurf/makefile.wat index 22c9ca3903..7cbf001b6e 100644 --- a/samples/opengl/isosurf/makefile.wat +++ b/samples/opengl/isosurf/makefile.wat @@ -256,7 +256,7 @@ $(OBJS)\isosurf.exe : $(ISOSURF_OBJECTS) $(OBJS)\isosurf_sample.res @%append $(OBJS)\isosurf.lbc option quiet @%append $(OBJS)\isosurf.lbc name $^@ @%append $(OBJS)\isosurf.lbc option caseexact - @%append $(OBJS)\isosurf.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\isosurf.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(ISOSURF_OBJECTS)) do @%append $(OBJS)\isosurf.lbc file %i @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\isosurf.lbc library %i @%append $(OBJS)\isosurf.lbc option resource=$(OBJS)\isosurf_sample.res diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in index 4983b43fdd..54cd9b1eeb 100644 --- a/samples/opengl/penguin/Makefile.in +++ b/samples/opengl/penguin/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -82,28 +81,20 @@ PENGUIN_OBJECTS = \ @COND_USE_OPENGL_1@__penguin___depname = penguin$(EXEEXT) @COND_PLATFORM_MAC_0@__penguin___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__penguin___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C penguin$(EXEEXT) -@COND_PLATFORM_MAC_1@__penguin___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL penguin$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___penguin___os2_emxbindcmd = $(NM) penguin$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep penguin$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__penguin___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___penguin___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__penguin_os2_lib_res = \ @@ -142,12 +133,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - penguin$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -169,8 +154,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile @COND_USE_OPENGL_1@penguin$(EXEEXT): $(PENGUIN_OBJECTS) $(__penguin___win32rc) -@COND_USE_OPENGL_1@ $(CXX) -o $@ $(PENGUIN_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -@COND_USE_OPENGL_1@ $(__penguin___mac_rezcmd) +@COND_USE_OPENGL_1@ $(CXX) -o $@ $(PENGUIN_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) +@COND_USE_OPENGL_1@ @COND_USE_OPENGL_1@ $(__penguin___mac_setfilecmd) @COND_USE_OPENGL_1@ $(__penguin___os2_emxbindcmd) @COND_USE_OPENGL_1@ $(SAMPLES_RPATH_POSTLINK) @@ -222,7 +207,16 @@ penguin_penguin_rc.o: $(srcdir)/penguin.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean penguin_bundle data diff --git a/samples/opengl/penguin/makefile.bcc b/samples/opengl/penguin/makefile.bcc index efc712ba04..03b23119de 100644 --- a/samples/opengl/penguin/makefile.bcc +++ b/samples/opengl/penguin/makefile.bcc @@ -241,7 +241,7 @@ clean: !if "$(USE_OPENGL)" == "1" $(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(PENGUIN_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\penguin_penguin.res | !endif diff --git a/samples/opengl/penguin/makefile.gcc b/samples/opengl/penguin/makefile.gcc index c10b96d944..2b1633e1da 100644 --- a/samples/opengl/penguin/makefile.gcc +++ b/samples/opengl/penguin/makefile.gcc @@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -236,7 +236,7 @@ clean: ifeq ($(USE_OPENGL),1) $(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin_rc.o - $(CXX) -o $@ $(PENGUIN_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(PENGUIN_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 endif data: diff --git a/samples/opengl/penguin/makefile.unx b/samples/opengl/penguin/makefile.unx index f4e1fcfd59..876b8711b3 100644 --- a/samples/opengl/penguin/makefile.unx +++ b/samples/opengl/penguin/makefile.unx @@ -54,7 +54,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -108,7 +108,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) penguin: $(PENGUIN_OBJECTS) - $(CXX) -o $@ $(PENGUIN_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs gl,core,base` + $(CXX) -o $@ $(PENGUIN_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs gl,core,base` $(LDFLAGS) penguin_penguin.o: ./penguin.cpp $(CXX) -c -o $@ $(PENGUIN_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/opengl/penguin/makefile.vc b/samples/opengl/penguin/makefile.vc index f44b54f311..7dfbe1f3ef 100644 --- a/samples/opengl/penguin/makefile.vc +++ b/samples/opengl/penguin/makefile.vc @@ -318,7 +318,7 @@ clean: !if "$(USE_OPENGL)" == "1" $(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\penguin.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\penguin.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(PENGUIN_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << !endif diff --git a/samples/opengl/penguin/makefile.wat b/samples/opengl/penguin/makefile.wat index c78d393a1a..f017e4742a 100644 --- a/samples/opengl/penguin/makefile.wat +++ b/samples/opengl/penguin/makefile.wat @@ -264,7 +264,7 @@ $(OBJS)\penguin.exe : $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res @%append $(OBJS)\penguin.lbc option quiet @%append $(OBJS)\penguin.lbc name $^@ @%append $(OBJS)\penguin.lbc option caseexact - @%append $(OBJS)\penguin.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\penguin.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(PENGUIN_OBJECTS)) do @%append $(OBJS)\penguin.lbc file %i @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\penguin.lbc library %i @%append $(OBJS)\penguin.lbc option resource=$(OBJS)\penguin_penguin.res diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in index d511ead995..c4a746bf73 100644 --- a/samples/ownerdrw/Makefile.in +++ b/samples/ownerdrw/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ OWNERDRW_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__ownerdrw___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__ownerdrw___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C ownerdrw$(EXEEXT) -@COND_PLATFORM_MAC_1@__ownerdrw___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ownerdrw$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___ownerdrw___os2_emxbindcmd = $(NM) ownerdrw$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep ownerdrw$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__ownerdrw___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___ownerdrw___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__ownerdrw_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - ownerdrw$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ownerdrw$(EXEEXT): $(OWNERDRW_OBJECTS) $(__ownerdrw___win32rc) - $(CXX) -o $@ $(OWNERDRW_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__ownerdrw___mac_rezcmd) + $(CXX) -o $@ $(OWNERDRW_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__ownerdrw___mac_setfilecmd) $(__ownerdrw___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -203,7 +188,16 @@ ownerdrw_ownerdrw_rc.o: $(srcdir)/ownerdrw.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean ownerdrw_bundle data diff --git a/samples/ownerdrw/makefile.bcc b/samples/ownerdrw/makefile.bcc index 64be277437..35b2d51de9 100644 --- a/samples/ownerdrw/makefile.bcc +++ b/samples/ownerdrw/makefile.bcc @@ -229,7 +229,7 @@ clean: -if exist $(OBJS)\ownerdrw.ils del $(OBJS)\ownerdrw.ils $(OBJS)\ownerdrw.exe: $(OWNERDRW_OBJECTS) $(OBJS)\ownerdrw_ownerdrw.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\ownerdrw_ownerdrw.res | diff --git a/samples/ownerdrw/makefile.gcc b/samples/ownerdrw/makefile.gcc index cce9387251..ca4ea1030c 100644 --- a/samples/ownerdrw/makefile.gcc +++ b/samples/ownerdrw/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\ownerdrw.exe del $(OBJS)\ownerdrw.exe $(OBJS)\ownerdrw.exe: $(OWNERDRW_OBJECTS) $(OBJS)\ownerdrw_ownerdrw_rc.o - $(CXX) -o $@ $(OWNERDRW_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(OWNERDRW_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/samples/ownerdrw/makefile.unx b/samples/ownerdrw/makefile.unx index 3555a8c6e6..a364c80196 100644 --- a/samples/ownerdrw/makefile.unx +++ b/samples/ownerdrw/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) ownerdrw: $(OWNERDRW_OBJECTS) - $(CXX) -o $@ $(OWNERDRW_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(OWNERDRW_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) ownerdrw_ownerdrw.o: ./ownerdrw.cpp $(CXX) -c -o $@ $(OWNERDRW_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/ownerdrw/makefile.vc b/samples/ownerdrw/makefile.vc index 0def4ce990..620ae73f79 100644 --- a/samples/ownerdrw/makefile.vc +++ b/samples/ownerdrw/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\ownerdrw.pdb del $(OBJS)\ownerdrw.pdb $(OBJS)\ownerdrw.exe: $(OWNERDRW_OBJECTS) $(OBJS)\ownerdrw_ownerdrw.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\ownerdrw.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\ownerdrw.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(OWNERDRW_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/ownerdrw/makefile.wat b/samples/ownerdrw/makefile.wat index 9ba3999a67..cb16b99430 100644 --- a/samples/ownerdrw/makefile.wat +++ b/samples/ownerdrw/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\ownerdrw.exe : $(OWNERDRW_OBJECTS) $(OBJS)\ownerdrw_ownerdrw.res @%append $(OBJS)\ownerdrw.lbc option quiet @%append $(OBJS)\ownerdrw.lbc name $^@ @%append $(OBJS)\ownerdrw.lbc option caseexact - @%append $(OBJS)\ownerdrw.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\ownerdrw.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(OWNERDRW_OBJECTS)) do @%append $(OBJS)\ownerdrw.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\ownerdrw.lbc library %i @%append $(OBJS)\ownerdrw.lbc option resource=$(OBJS)\ownerdrw_ownerdrw.res diff --git a/samples/popup/Makefile.in b/samples/popup/Makefile.in index 8fe5616803..a293c53c01 100644 --- a/samples/popup/Makefile.in +++ b/samples/popup/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ POPUP_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__popup___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__popup___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C popup$(EXEEXT) -@COND_PLATFORM_MAC_1@__popup___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL popup$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___popup___os2_emxbindcmd = $(NM) popup$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep popup$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__popup___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___popup___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__popup_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - popup$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile popup$(EXEEXT): $(POPUP_OBJECTS) $(__popup___win32rc) - $(CXX) -o $@ $(POPUP_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__popup___mac_rezcmd) + $(CXX) -o $@ $(POPUP_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__popup___mac_setfilecmd) $(__popup___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ popup_sample_rc.o: $(srcdir)/../sample.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean popup_bundle diff --git a/samples/popup/makefile.bcc b/samples/popup/makefile.bcc index 29882ca471..57d3d22bae 100644 --- a/samples/popup/makefile.bcc +++ b/samples/popup/makefile.bcc @@ -229,7 +229,7 @@ clean: -if exist $(OBJS)\popup.ils del $(OBJS)\popup.ils $(OBJS)\popup.exe: $(POPUP_OBJECTS) $(OBJS)\popup_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(POPUP_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\popup_sample.res | diff --git a/samples/popup/makefile.gcc b/samples/popup/makefile.gcc index affd196c3c..db731a0a82 100644 --- a/samples/popup/makefile.gcc +++ b/samples/popup/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\popup.exe del $(OBJS)\popup.exe $(OBJS)\popup.exe: $(POPUP_OBJECTS) $(OBJS)\popup_sample_rc.o - $(CXX) -o $@ $(POPUP_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(POPUP_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\popup_popup.o: ./popup.cpp $(CXX) -c -o $@ $(POPUP_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/popup/makefile.unx b/samples/popup/makefile.unx index 57a64a98d6..08e8cfc6cb 100644 --- a/samples/popup/makefile.unx +++ b/samples/popup/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) popup: $(POPUP_OBJECTS) - $(CXX) -o $@ $(POPUP_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(POPUP_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) popup_popup.o: ./popup.cpp $(CXX) -c -o $@ $(POPUP_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/popup/makefile.vc b/samples/popup/makefile.vc index 456d98d20e..e36c79b04a 100644 --- a/samples/popup/makefile.vc +++ b/samples/popup/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\popup.pdb del $(OBJS)\popup.pdb $(OBJS)\popup.exe: $(POPUP_OBJECTS) $(OBJS)\popup_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\popup.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\popup.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(POPUP_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/popup/makefile.wat b/samples/popup/makefile.wat index 8b90ce505d..1456c851b3 100644 --- a/samples/popup/makefile.wat +++ b/samples/popup/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\popup.exe : $(POPUP_OBJECTS) $(OBJS)\popup_sample.res @%append $(OBJS)\popup.lbc option quiet @%append $(OBJS)\popup.lbc name $^@ @%append $(OBJS)\popup.lbc option caseexact - @%append $(OBJS)\popup.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\popup.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(POPUP_OBJECTS)) do @%append $(OBJS)\popup.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\popup.lbc library %i @%append $(OBJS)\popup.lbc option resource=$(OBJS)\popup_sample.res diff --git a/samples/popup/popup.cpp b/samples/popup/popup.cpp index e48e765b20..2cbf41b01c 100644 --- a/samples/popup/popup.cpp +++ b/samples/popup/popup.cpp @@ -154,7 +154,7 @@ SimpleTransientPopup::~SimpleTransientPopup() void SimpleTransientPopup::Popup(wxWindow *focus) { wxLogMessage( wxT("0x%lx SimpleTransientPopup::Popup"), long(this) ); - wxPopupTransientWindow::Popup(focus ? focus : m_panel); + wxPopupTransientWindow::Popup(); } void SimpleTransientPopup::OnDismiss() @@ -263,6 +263,7 @@ public: void OnTestDialog(wxCommandEvent& event); void OnStartSimplePopup(wxCommandEvent& event); void OnStartScrolledPopup(wxCommandEvent& event); + void OnActivate(wxActivateEvent& event); private: SimpleTransientPopup *m_simplePopup; @@ -314,6 +315,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Minimal_Quit, MyFrame::OnQuit) EVT_MENU(Minimal_About, MyFrame::OnAbout) EVT_MENU(Minimal_TestDialog, MyFrame::OnTestDialog) + EVT_ACTIVATE(MyFrame::OnActivate) EVT_BUTTON(Minimal_StartSimplePopup, MyFrame::OnStartSimplePopup) EVT_BUTTON(Minimal_StartScrolledPopup, MyFrame::OnStartScrolledPopup) END_EVENT_TABLE() @@ -378,6 +380,11 @@ MyFrame::~MyFrame() // event handlers +void MyFrame::OnActivate(wxActivateEvent& event) +{ + wxLogMessage( wxT("In activate...") ); +} + void MyFrame::OnStartSimplePopup(wxCommandEvent& event) { wxLogMessage( wxT("================================================") ); diff --git a/samples/power/Makefile.in b/samples/power/Makefile.in index 5ce6938096..5f0646fd2f 100644 --- a/samples/power/Makefile.in +++ b/samples/power/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ POWER_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__power___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__power___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C power$(EXEEXT) -@COND_PLATFORM_MAC_1@__power___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL power$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___power___os2_emxbindcmd = $(NM) power$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep power$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__power___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___power___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__power___win32rc = power_sample_rc.o @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - power$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile power$(EXEEXT): $(POWER_OBJECTS) $(__power___win32rc) - $(CXX) -o $@ $(POWER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__power___mac_rezcmd) + $(CXX) -o $@ $(POWER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__power___mac_setfilecmd) $(__power___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ power_power.o: $(srcdir)/power.cpp $(CXXC) -c -o $@ $(POWER_CXXFLAGS) $(srcdir)/power.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean power_bundle diff --git a/samples/power/makefile.bcc b/samples/power/makefile.bcc index adb8235b4f..2296f724af 100644 --- a/samples/power/makefile.bcc +++ b/samples/power/makefile.bcc @@ -229,7 +229,7 @@ clean: -if exist $(OBJS)\power.ils del $(OBJS)\power.ils $(OBJS)\power.exe: $(POWER_OBJECTS) $(OBJS)\power_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(POWER_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\power_sample.res | diff --git a/samples/power/makefile.gcc b/samples/power/makefile.gcc index 28ddff852d..680795f2ad 100644 --- a/samples/power/makefile.gcc +++ b/samples/power/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\power.exe del $(OBJS)\power.exe $(OBJS)\power.exe: $(POWER_OBJECTS) $(OBJS)\power_sample_rc.o - $(CXX) -o $@ $(POWER_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(POWER_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\power_sample_rc.o: ./../../samples/sample.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH diff --git a/samples/power/makefile.unx b/samples/power/makefile.unx index 42e61aabb0..80c202448a 100644 --- a/samples/power/makefile.unx +++ b/samples/power/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) power: $(POWER_OBJECTS) - $(CXX) -o $@ $(POWER_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(POWER_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) power_power.o: ./power.cpp $(CXX) -c -o $@ $(POWER_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/power/makefile.vc b/samples/power/makefile.vc index 2823beda47..bea5bfb14c 100644 --- a/samples/power/makefile.vc +++ b/samples/power/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\power.pdb del $(OBJS)\power.pdb $(OBJS)\power.exe: $(POWER_OBJECTS) $(OBJS)\power_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\power.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\power.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(POWER_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/power/makefile.wat b/samples/power/makefile.wat index 7676483c8e..31a79fb92a 100644 --- a/samples/power/makefile.wat +++ b/samples/power/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\power.exe : $(POWER_OBJECTS) $(OBJS)\power_sample.res @%append $(OBJS)\power.lbc option quiet @%append $(OBJS)\power.lbc name $^@ @%append $(OBJS)\power.lbc option caseexact - @%append $(OBJS)\power.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\power.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(POWER_OBJECTS)) do @%append $(OBJS)\power.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\power.lbc library %i @%append $(OBJS)\power.lbc option resource=$(OBJS)\power_sample.res diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in index e8d5fe1fd6..d4b6e1c80f 100644 --- a/samples/printing/Makefile.in +++ b/samples/printing/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ PRINTING_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__printing___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__printing___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C printing$(EXEEXT) -@COND_PLATFORM_MAC_1@__printing___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL printing$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___printing___os2_emxbindcmd = $(NM) printing$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep printing$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__printing___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___printing___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__printing_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - printing$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc) - $(CXX) -o $@ $(PRINTING_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__printing___mac_rezcmd) + $(CXX) -o $@ $(PRINTING_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__printing___mac_setfilecmd) $(__printing___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ printing_printing_rc.o: $(srcdir)/printing.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean printing_bundle diff --git a/samples/printing/makefile.bcc b/samples/printing/makefile.bcc index eba9836115..ace311d1c1 100644 --- a/samples/printing/makefile.bcc +++ b/samples/printing/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(PRINTING_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\printing_printing.res | diff --git a/samples/printing/makefile.gcc b/samples/printing/makefile.gcc index 61e2423113..fe0ff12ac7 100644 --- a/samples/printing/makefile.gcc +++ b/samples/printing/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe $(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_printing_rc.o - $(CXX) -o $@ $(PRINTING_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(PRINTING_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\printing_printing.o: ./printing.cpp $(CXX) -c -o $@ $(PRINTING_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/printing/makefile.unx b/samples/printing/makefile.unx index 9bf1423dc1..9efeed76cd 100644 --- a/samples/printing/makefile.unx +++ b/samples/printing/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) printing: $(PRINTING_OBJECTS) - $(CXX) -o $@ $(PRINTING_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(PRINTING_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) printing_printing.o: ./printing.cpp $(CXX) -c -o $@ $(PRINTING_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/printing/makefile.vc b/samples/printing/makefile.vc index b71d4bb20f..f0785f58c9 100644 --- a/samples/printing/makefile.vc +++ b/samples/printing/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\printing.pdb del $(OBJS)\printing.pdb $(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\printing.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\printing.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(PRINTING_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/printing/makefile.wat b/samples/printing/makefile.wat index 2ae69860d0..488bb1b483 100644 --- a/samples/printing/makefile.wat +++ b/samples/printing/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\printing.exe : $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res @%append $(OBJS)\printing.lbc option quiet @%append $(OBJS)\printing.lbc name $^@ @%append $(OBJS)\printing.lbc option caseexact - @%append $(OBJS)\printing.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\printing.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(PRINTING_OBJECTS)) do @%append $(OBJS)\printing.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\printing.lbc library %i @%append $(OBJS)\printing.lbc option resource=$(OBJS)\printing_printing.res diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in index e646376fc7..1852820639 100644 --- a/samples/regtest/Makefile.in +++ b/samples/regtest/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ REGTEST_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__regtest___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__regtest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C regtest$(EXEEXT) -@COND_PLATFORM_MAC_1@__regtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL regtest$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___regtest___os2_emxbindcmd = $(NM) regtest$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep regtest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__regtest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___regtest___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__regtest_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - regtest$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile regtest$(EXEEXT): $(REGTEST_OBJECTS) $(__regtest___win32rc) - $(CXX) -o $@ $(REGTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__regtest___mac_rezcmd) + $(CXX) -o $@ $(REGTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__regtest___mac_setfilecmd) $(__regtest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ regtest_regtest_rc.o: $(srcdir)/regtest.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean regtest_bundle diff --git a/samples/regtest/makefile.bcc b/samples/regtest/makefile.bcc index 328cfcacae..531cae7f29 100644 --- a/samples/regtest/makefile.bcc +++ b/samples/regtest/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\regtest_regtest.res | diff --git a/samples/regtest/makefile.gcc b/samples/regtest/makefile.gcc index 861ba9f9d8..f7b6ae739a 100644 --- a/samples/regtest/makefile.gcc +++ b/samples/regtest/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\regtest.exe del $(OBJS)\regtest.exe $(OBJS)\regtest.exe: $(REGTEST_OBJECTS) $(OBJS)\regtest_regtest_rc.o - $(CXX) -o $@ $(REGTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(REGTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\regtest_regtest.o: ./regtest.cpp $(CXX) -c -o $@ $(REGTEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/regtest/makefile.unx b/samples/regtest/makefile.unx index f5a836df13..95f6a16892 100644 --- a/samples/regtest/makefile.unx +++ b/samples/regtest/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) regtest: $(REGTEST_OBJECTS) - $(CXX) -o $@ $(REGTEST_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(REGTEST_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) regtest_regtest.o: ./regtest.cpp $(CXX) -c -o $@ $(REGTEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/regtest/makefile.vc b/samples/regtest/makefile.vc index 2c5c8fb8a6..dc6b5d29d1 100644 --- a/samples/regtest/makefile.vc +++ b/samples/regtest/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\regtest.pdb del $(OBJS)\regtest.pdb $(OBJS)\regtest.exe: $(REGTEST_OBJECTS) $(OBJS)\regtest_regtest.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\regtest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\regtest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(REGTEST_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/regtest/makefile.wat b/samples/regtest/makefile.wat index 62bd27dc8b..34cf294539 100644 --- a/samples/regtest/makefile.wat +++ b/samples/regtest/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\regtest.exe : $(REGTEST_OBJECTS) $(OBJS)\regtest_regtest.res @%append $(OBJS)\regtest.lbc option quiet @%append $(OBJS)\regtest.lbc name $^@ @%append $(OBJS)\regtest.lbc option caseexact - @%append $(OBJS)\regtest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\regtest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(REGTEST_OBJECTS)) do @%append $(OBJS)\regtest.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\regtest.lbc library %i @%append $(OBJS)\regtest.lbc option resource=$(OBJS)\regtest_regtest.res diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in index f2ccaaf541..70e6a221c7 100644 --- a/samples/render/Makefile.in +++ b/samples/render/Makefile.in @@ -15,7 +15,6 @@ SHARED_LD_MODULE_CXX = @SHARED_LD_MODULE_CXX@ SO_SUFFIX_MODULE = @SO_SUFFIX_MODULE@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ PIC_FLAG = @PIC_FLAG@ STRIP = @STRIP@ @@ -95,24 +94,16 @@ RENDDLL_OBJECTS = \ @COND_BUILD_DEBUG_UNICODE_1@PLUGINSUFFIX = ud @COND_PLATFORM_MAC_0@__render___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__render___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C render$(EXEEXT) -@COND_PLATFORM_MAC_1@__render___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL render$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___render___os2_emxbindcmd = $(NM) render$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep render$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__render___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___render___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__render___win32rc = render_sample_rc.o @@ -130,12 +121,6 @@ COND_SHARED_1___renddll___depname = \ @COND_SHARED_1@__renddll___depname = $(COND_SHARED_1___renddll___depname) @COND_SHARED_1@__install_renddll___depname = install_renddll @COND_SHARED_1@__uninstall_renddll___depname = uninstall_renddll -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - render$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI @@ -188,8 +173,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc) - $(CXX) -o $@ $(RENDER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__render___mac_rezcmd) + $(CXX) -o $@ $(RENDER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__render___mac_setfilecmd) $(__render___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -217,7 +202,7 @@ render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc) @COND_PLATFORM_MACOSX_1@render_bundle: $(____render_BUNDLE_TGT_REF_DEP) @COND_SHARED_1@$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE): $(RENDDLL_OBJECTS) -@COND_SHARED_1@ $(SHARED_LD_MODULE_CXX) $@ $(RENDDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) +@COND_SHARED_1@ $(SHARED_LD_MODULE_CXX) $@ $(RENDDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) @COND_SHARED_1@install_renddll: @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(PLUGINS_INST_DIR) @@ -236,7 +221,17 @@ renddll_renddll.o: $(srcdir)/renddll.cpp $(CXXC) -c -o $@ $(RENDDLL_CXXFLAGS) $(srcdir)/renddll.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d -.PHONY: all install uninstall clean distclean render_bundle install_renddll uninstall_renddll +.PHONY: all install uninstall clean distclean render_bundle install_renddll \ + uninstall_renddll diff --git a/samples/render/makefile.bcc b/samples/render/makefile.bcc index 53d3f09ec1..b69766fdd6 100644 --- a/samples/render/makefile.bcc +++ b/samples/render/makefile.bcc @@ -260,13 +260,13 @@ clean: -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_bcc.ils del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_bcc.ils $(OBJS)\render.exe: $(RENDER_OBJECTS) $(OBJS)\render_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\render_sample.res | !if "$(SHARED)" == "1" $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_bcc.dll: $(RENDDLL_OBJECTS) - ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| + ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, | !endif diff --git a/samples/render/makefile.gcc b/samples/render/makefile.gcc index b678b8d40a..a1b18cff93 100644 --- a/samples/render/makefile.gcc +++ b/samples/render/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 COMPILER_PREFIX = gcc @@ -259,11 +259,11 @@ clean: -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_gcc.dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_gcc.dll $(OBJS)\render.exe: $(RENDER_OBJECTS) $(OBJS)\render_sample_rc.o - $(CXX) -o $@ $(RENDER_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(RENDER_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 ifeq ($(SHARED),1) $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_gcc.dll: $(RENDDLL_OBJECTS) - $(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(RENDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(RENDDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 endif $(OBJS)\render_sample_rc.o: ./../../samples/sample.rc diff --git a/samples/render/makefile.unx b/samples/render/makefile.unx index f4b8eacc26..af1ae4cde8 100644 --- a/samples/render/makefile.unx +++ b/samples/render/makefile.unx @@ -54,7 +54,7 @@ SHARED := 0 ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -112,11 +112,11 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) render: $(RENDER_OBJECTS) - $(CXX) -o $@ $(RENDER_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(RENDER_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) ifeq ($(SHARED),1) renddll.so: $(RENDDLL_OBJECTS) - $(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(RENDDLL_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(RENDDLL_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) endif render_render.o: ./render.cpp diff --git a/samples/render/makefile.vc b/samples/render/makefile.vc index fc823e1aa3..345153bd32 100644 --- a/samples/render/makefile.vc +++ b/samples/render/makefile.vc @@ -341,13 +341,13 @@ clean: -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_vc.pdb del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_vc.pdb $(OBJS)\render.exe: $(RENDER_OBJECTS) $(OBJS)\render_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\render.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\render.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(RENDER_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << !if "$(SHARED)" == "1" $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_vc.dll: $(RENDDLL_OBJECTS) - link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_vc.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_vc.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(RENDDLL_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << !endif diff --git a/samples/render/makefile.wat b/samples/render/makefile.wat index 659ffed26c..f253e298b7 100644 --- a/samples/render/makefile.wat +++ b/samples/render/makefile.wat @@ -287,7 +287,7 @@ $(OBJS)\render.exe : $(RENDER_OBJECTS) $(OBJS)\render_sample.res @%append $(OBJS)\render.lbc option quiet @%append $(OBJS)\render.lbc name $^@ @%append $(OBJS)\render.lbc option caseexact - @%append $(OBJS)\render.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\render.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(RENDER_OBJECTS)) do @%append $(OBJS)\render.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\render.lbc library %i @%append $(OBJS)\render.lbc option resource=$(OBJS)\render_sample.res @@ -300,7 +300,7 @@ $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_wat.d @%append $(OBJS)\renddll.lbc option quiet @%append $(OBJS)\renddll.lbc name $^@ @%append $(OBJS)\renddll.lbc option caseexact - @%append $(OBJS)\renddll.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) + @%append $(OBJS)\renddll.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) $(LDFLAGS) @for %i in ($(RENDDLL_OBJECTS)) do @%append $(OBJS)\renddll.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\renddll.lbc library %i @%append $(OBJS)\renddll.lbc diff --git a/samples/richtext/Makefile.in b/samples/richtext/Makefile.in index df503d416d..343af81a3d 100644 --- a/samples/richtext/Makefile.in +++ b/samples/richtext/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -74,28 +73,20 @@ RICHTEXT_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__richtext___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__richtext___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C richtext$(EXEEXT) -@COND_PLATFORM_MAC_1@__richtext___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL richtext$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___richtext___os2_emxbindcmd = $(NM) richtext$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep richtext$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__richtext___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___richtext___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__richtext_os2_lib_res = \ @@ -145,12 +136,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - richtext$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -172,8 +157,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile richtext$(EXEEXT): $(RICHTEXT_OBJECTS) $(__richtext___win32rc) - $(CXX) -o $@ $(RICHTEXT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_RICHTEXT_p) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__richtext___mac_rezcmd) + $(CXX) -o $@ $(RICHTEXT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_RICHTEXT_p) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__richtext___mac_setfilecmd) $(__richtext___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -207,7 +192,16 @@ richtext_sample_rc.o: $(srcdir)/../sample.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean richtext_bundle diff --git a/samples/richtext/makefile.bcc b/samples/richtext/makefile.bcc index 98e7bd9fd7..9c9b2f72d3 100644 --- a/samples/richtext/makefile.bcc +++ b/samples/richtext/makefile.bcc @@ -245,7 +245,7 @@ clean: -if exist $(OBJS)\richtext.ils del $(OBJS)\richtext.ils $(OBJS)\richtext.exe: $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(RICHTEXT_OBJECTS),$@,, $(__WXLIB_RICHTEXT_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\richtext_sample.res | diff --git a/samples/richtext/makefile.gcc b/samples/richtext/makefile.gcc index f5d85feae7..353bc7547c 100644 --- a/samples/richtext/makefile.gcc +++ b/samples/richtext/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -240,7 +240,7 @@ clean: -if exist $(OBJS)\richtext.exe del $(OBJS)\richtext.exe $(OBJS)\richtext.exe: $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample_rc.o - $(CXX) -o $@ $(RICHTEXT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_RICHTEXT_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(RICHTEXT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_RICHTEXT_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\richtext_richtext.o: ./richtext.cpp $(CXX) -c -o $@ $(RICHTEXT_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/richtext/makefile.unx b/samples/richtext/makefile.unx index c77e80514d..e2387cedce 100644 --- a/samples/richtext/makefile.unx +++ b/samples/richtext/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) richtext: $(RICHTEXT_OBJECTS) - $(CXX) -o $@ $(RICHTEXT_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs richtext,adv,html,core,xml,base` + $(CXX) -o $@ $(RICHTEXT_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs richtext,adv,html,core,xml,base` $(LDFLAGS) richtext_richtext.o: ./richtext.cpp $(CXX) -c -o $@ $(RICHTEXT_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/richtext/makefile.vc b/samples/richtext/makefile.vc index 266e17df84..5ad7d7f10e 100644 --- a/samples/richtext/makefile.vc +++ b/samples/richtext/makefile.vc @@ -321,7 +321,7 @@ clean: -if exist $(OBJS)\richtext.pdb del $(OBJS)\richtext.pdb $(OBJS)\richtext.exe: $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\richtext.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\richtext.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(RICHTEXT_OBJECTS) $(__WXLIB_RICHTEXT_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/richtext/makefile.wat b/samples/richtext/makefile.wat index 32b730071e..320882d695 100644 --- a/samples/richtext/makefile.wat +++ b/samples/richtext/makefile.wat @@ -271,7 +271,7 @@ $(OBJS)\richtext.exe : $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample.res @%append $(OBJS)\richtext.lbc option quiet @%append $(OBJS)\richtext.lbc name $^@ @%append $(OBJS)\richtext.lbc option caseexact - @%append $(OBJS)\richtext.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\richtext.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(RICHTEXT_OBJECTS)) do @%append $(OBJS)\richtext.lbc file %i @for %i in ( $(__WXLIB_RICHTEXT_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\richtext.lbc library %i @%append $(OBJS)\richtext.lbc option resource=$(OBJS)\richtext_sample.res diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in index fc0e6219a8..a9fd72ce59 100644 --- a/samples/sashtest/Makefile.in +++ b/samples/sashtest/Makefile.in @@ -146,7 +146,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile sashtest$(EXEEXT): $(SASHTEST_OBJECTS) $(__sashtest___win32rc) - $(CXX) -o $@ $(SASHTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) + $(CXX) -o $@ $(SASHTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) $(__sashtest___mac_setfilecmd) $(__sashtest___os2_emxbindcmd) @@ -191,6 +191,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ $(srcdir)/include/wx/stc/stc.h # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean sashtest_bundle diff --git a/samples/sashtest/makefile.bcc b/samples/sashtest/makefile.bcc index b281e9dddd..2da87b525c 100644 --- a/samples/sashtest/makefile.bcc +++ b/samples/sashtest/makefile.bcc @@ -233,7 +233,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\sashtest_sashtest.res | diff --git a/samples/sashtest/makefile.gcc b/samples/sashtest/makefile.gcc index 6d8c56d546..3f94b1138c 100644 --- a/samples/sashtest/makefile.gcc +++ b/samples/sashtest/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: -if exist $(OBJS)\sashtest.exe del $(OBJS)\sashtest.exe $(OBJS)\sashtest.exe: $(SASHTEST_OBJECTS) $(OBJS)\sashtest_sashtest_rc.o - $(CXX) -o $@ $(SASHTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(SASHTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\sashtest_sashtest.o: ./sashtest.cpp $(CXX) -c -o $@ $(SASHTEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/sashtest/makefile.unx b/samples/sashtest/makefile.unx index afa54e4e3c..9dfaa0bab4 100644 --- a/samples/sashtest/makefile.unx +++ b/samples/sashtest/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) sashtest: $(SASHTEST_OBJECTS) - $(CXX) -o $@ $(SASHTEST_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` + $(CXX) -o $@ $(SASHTEST_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` $(LDFLAGS) sashtest_sashtest.o: ./sashtest.cpp $(CXX) -c -o $@ $(SASHTEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/sashtest/makefile.vc b/samples/sashtest/makefile.vc index 4b6e775984..c115199433 100644 --- a/samples/sashtest/makefile.vc +++ b/samples/sashtest/makefile.vc @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\sashtest.pdb del $(OBJS)\sashtest.pdb $(OBJS)\sashtest.exe: $(SASHTEST_OBJECTS) $(OBJS)\sashtest_sashtest.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\sashtest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\sashtest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/sashtest/makefile.wat b/samples/sashtest/makefile.wat index c138358ed7..ec27ffc592 100644 --- a/samples/sashtest/makefile.wat +++ b/samples/sashtest/makefile.wat @@ -256,7 +256,7 @@ $(OBJS)\sashtest.exe : $(SASHTEST_OBJECTS) $(OBJS)\sashtest_sashtest.res @%append $(OBJS)\sashtest.lbc option quiet @%append $(OBJS)\sashtest.lbc name $^@ @%append $(OBJS)\sashtest.lbc option caseexact - @%append $(OBJS)\sashtest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\sashtest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(SASHTEST_OBJECTS)) do @%append $(OBJS)\sashtest.lbc file %i @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\sashtest.lbc library %i @%append $(OBJS)\sashtest.lbc option resource=$(OBJS)\sashtest_sashtest.res diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in index 779c0a3582..9788dc4fd6 100644 --- a/samples/scroll/Makefile.in +++ b/samples/scroll/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ SCROLL_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__scroll___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__scroll___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C scroll$(EXEEXT) -@COND_PLATFORM_MAC_1@__scroll___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL scroll$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___scroll___os2_emxbindcmd = $(NM) scroll$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep scroll$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__scroll___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___scroll___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__scroll_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - scroll$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile scroll$(EXEEXT): $(SCROLL_OBJECTS) $(__scroll___win32rc) - $(CXX) -o $@ $(SCROLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__scroll___mac_rezcmd) + $(CXX) -o $@ $(SCROLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__scroll___mac_setfilecmd) $(__scroll___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ scroll_scroll_rc.o: $(srcdir)/scroll.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean scroll_bundle diff --git a/samples/scroll/makefile.bcc b/samples/scroll/makefile.bcc index cf26deac24..493ba92b7d 100644 --- a/samples/scroll/makefile.bcc +++ b/samples/scroll/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(SCROLL_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\scroll_scroll.res | diff --git a/samples/scroll/makefile.gcc b/samples/scroll/makefile.gcc index 82c4c51eec..1d62400811 100644 --- a/samples/scroll/makefile.gcc +++ b/samples/scroll/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe $(OBJS)\scroll.exe: $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll_rc.o - $(CXX) -o $@ $(SCROLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(SCROLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\scroll_scroll.o: ./scroll.cpp $(CXX) -c -o $@ $(SCROLL_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/scroll/makefile.unx b/samples/scroll/makefile.unx index 145ee5b4f7..107eef7562 100644 --- a/samples/scroll/makefile.unx +++ b/samples/scroll/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) scroll: $(SCROLL_OBJECTS) - $(CXX) -o $@ $(SCROLL_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(SCROLL_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) scroll_scroll.o: ./scroll.cpp $(CXX) -c -o $@ $(SCROLL_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/scroll/makefile.vc b/samples/scroll/makefile.vc index 89cb23f4df..9ee89e4ece 100644 --- a/samples/scroll/makefile.vc +++ b/samples/scroll/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\scroll.pdb del $(OBJS)\scroll.pdb $(OBJS)\scroll.exe: $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\scroll.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\scroll.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(SCROLL_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/scroll/makefile.wat b/samples/scroll/makefile.wat index 86368197bf..53f3f408f9 100644 --- a/samples/scroll/makefile.wat +++ b/samples/scroll/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\scroll.exe : $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll.res @%append $(OBJS)\scroll.lbc option quiet @%append $(OBJS)\scroll.lbc name $^@ @%append $(OBJS)\scroll.lbc option caseexact - @%append $(OBJS)\scroll.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\scroll.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(SCROLL_OBJECTS)) do @%append $(OBJS)\scroll.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\scroll.lbc library %i @%append $(OBJS)\scroll.lbc option resource=$(OBJS)\scroll_scroll.res diff --git a/samples/scrollsub/Makefile.in b/samples/scrollsub/Makefile.in index e2270d77bc..9bb2a2e512 100644 --- a/samples/scrollsub/Makefile.in +++ b/samples/scrollsub/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ SCROLLSUB_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__scrollsub___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__scrollsub___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C scrollsub$(EXEEXT) -@COND_PLATFORM_MAC_1@__scrollsub___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL scrollsub$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___scrollsub___os2_emxbindcmd = $(NM) scrollsub$(EXEEXT) | \ if grep -q pmwin.763 ; then emxbind -ep scrollsub$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__scrollsub___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___scrollsub___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__scrollsub_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - scrollsub$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile scrollsub$(EXEEXT): $(SCROLLSUB_OBJECTS) $(__scrollsub___win32rc) - $(CXX) -o $@ $(SCROLLSUB_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__scrollsub___mac_rezcmd) + $(CXX) -o $@ $(SCROLLSUB_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__scrollsub___mac_setfilecmd) $(__scrollsub___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ scrollsub_scrollsub_rc.o: $(srcdir)/scrollsub.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean scrollsub_bundle diff --git a/samples/scrollsub/makefile.bcc b/samples/scrollsub/makefile.bcc index 4c59b00cec..2668a163ff 100644 --- a/samples/scrollsub/makefile.bcc +++ b/samples/scrollsub/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\scrollsub_scrollsub.res | diff --git a/samples/scrollsub/makefile.gcc b/samples/scrollsub/makefile.gcc index 377eb1e449..3a95753628 100644 --- a/samples/scrollsub/makefile.gcc +++ b/samples/scrollsub/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\scrollsub.exe del $(OBJS)\scrollsub.exe $(OBJS)\scrollsub.exe: $(SCROLLSUB_OBJECTS) $(OBJS)\scrollsub_scrollsub_rc.o - $(CXX) -o $@ $(SCROLLSUB_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(SCROLLSUB_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\scrollsub_scrollsub.o: ./scrollsub.cpp $(CXX) -c -o $@ $(SCROLLSUB_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/scrollsub/makefile.unx b/samples/scrollsub/makefile.unx index 7bd9bade24..27dcb835fb 100644 --- a/samples/scrollsub/makefile.unx +++ b/samples/scrollsub/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) scrollsub: $(SCROLLSUB_OBJECTS) - $(CXX) -o $@ $(SCROLLSUB_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(SCROLLSUB_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) scrollsub_scrollsub.o: ./scrollsub.cpp $(CXX) -c -o $@ $(SCROLLSUB_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/scrollsub/makefile.vc b/samples/scrollsub/makefile.vc index 9098627413..25c1c3686b 100644 --- a/samples/scrollsub/makefile.vc +++ b/samples/scrollsub/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\scrollsub.pdb del $(OBJS)\scrollsub.pdb $(OBJS)\scrollsub.exe: $(SCROLLSUB_OBJECTS) $(OBJS)\scrollsub_scrollsub.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\scrollsub.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\scrollsub.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(SCROLLSUB_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/scrollsub/makefile.wat b/samples/scrollsub/makefile.wat index 1c0c961115..a6a1fd1faa 100644 --- a/samples/scrollsub/makefile.wat +++ b/samples/scrollsub/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\scrollsub.exe : $(SCROLLSUB_OBJECTS) $(OBJS)\scrollsub_scrollsub.res @%append $(OBJS)\scrollsub.lbc option quiet @%append $(OBJS)\scrollsub.lbc name $^@ @%append $(OBJS)\scrollsub.lbc option caseexact - @%append $(OBJS)\scrollsub.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\scrollsub.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(SCROLLSUB_OBJECTS)) do @%append $(OBJS)\scrollsub.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\scrollsub.lbc library %i @%append $(OBJS)\scrollsub.lbc option resource=$(OBJS)\scrollsub_scrollsub.res diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in index a2c7e06903..95c77e330f 100644 --- a/samples/shaped/Makefile.in +++ b/samples/shaped/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ SHAPED_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__shaped___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__shaped___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C shaped$(EXEEXT) -@COND_PLATFORM_MAC_1@__shaped___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL shaped$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___shaped___os2_emxbindcmd = $(NM) shaped$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep shaped$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__shaped___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___shaped___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__shaped_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - shaped$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile shaped$(EXEEXT): $(SHAPED_OBJECTS) $(__shaped___win32rc) - $(CXX) -o $@ $(SHAPED_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__shaped___mac_rezcmd) + $(CXX) -o $@ $(SHAPED_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__shaped___mac_setfilecmd) $(__shaped___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -203,7 +188,16 @@ shaped_shaped_rc.o: $(srcdir)/shaped.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean shaped_bundle data diff --git a/samples/shaped/makefile.bcc b/samples/shaped/makefile.bcc index 4df1888348..ab6988a6d4 100644 --- a/samples/shaped/makefile.bcc +++ b/samples/shaped/makefile.bcc @@ -229,7 +229,7 @@ clean: -if exist $(OBJS)\shaped.ils del $(OBJS)\shaped.ils $(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(SHAPED_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\shaped_shaped.res | diff --git a/samples/shaped/makefile.gcc b/samples/shaped/makefile.gcc index 8d6f311b89..2e27b5b635 100644 --- a/samples/shaped/makefile.gcc +++ b/samples/shaped/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe $(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped_rc.o - $(CXX) -o $@ $(SHAPED_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(SHAPED_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/samples/shaped/makefile.unx b/samples/shaped/makefile.unx index 2c68daab73..d152849baa 100644 --- a/samples/shaped/makefile.unx +++ b/samples/shaped/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) shaped: $(SHAPED_OBJECTS) - $(CXX) -o $@ $(SHAPED_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(SHAPED_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) shaped_shaped.o: ./shaped.cpp $(CXX) -c -o $@ $(SHAPED_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/shaped/makefile.vc b/samples/shaped/makefile.vc index 2484daa972..ac8b3e3e88 100644 --- a/samples/shaped/makefile.vc +++ b/samples/shaped/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\shaped.pdb del $(OBJS)\shaped.pdb $(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\shaped.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\shaped.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(SHAPED_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/shaped/makefile.wat b/samples/shaped/makefile.wat index 571d48ba42..d378f613e2 100644 --- a/samples/shaped/makefile.wat +++ b/samples/shaped/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\shaped.exe : $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res @%append $(OBJS)\shaped.lbc option quiet @%append $(OBJS)\shaped.lbc name $^@ @%append $(OBJS)\shaped.lbc option caseexact - @%append $(OBJS)\shaped.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\shaped.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(SHAPED_OBJECTS)) do @%append $(OBJS)\shaped.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\shaped.lbc library %i @%append $(OBJS)\shaped.lbc option resource=$(OBJS)\shaped_shaped.res diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in index e58f1a837e..4ce75a22a0 100644 --- a/samples/sockets/Makefile.in +++ b/samples/sockets/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -91,8 +90,7 @@ BASESERVER_OBJECTS = \ @COND_USE_GUI_1@__client___depname = client$(EXEEXT) @COND_PLATFORM_MAC_0@__client___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__client___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C client$(EXEEXT) -@COND_PLATFORM_MAC_1@__client___mac_rezcmd = $(__MACOSX_RESOURCES_p_2) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL client$(EXEEXT) COND_PLATFORM_OS2_1___client___os2_emxbindcmd = $(NM) client$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep client$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__client___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___client___os2_emxbindcmd) @@ -107,8 +105,7 @@ COND_PLATFORM_OS2_1___client___os2_emxbindcmd = $(NM) client$(EXEEXT) | if grep @COND_USE_GUI_1@__server___depname = server$(EXEEXT) @COND_PLATFORM_MAC_0@__server___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__server___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C server$(EXEEXT) -@COND_PLATFORM_MAC_1@__server___mac_rezcmd = $(__MACOSX_RESOURCES_p_3) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL server$(EXEEXT) COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep server$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__server___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___server___os2_emxbindcmd) @@ -126,31 +123,12 @@ COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep @COND_PLATFORM_MAC_0@__baseserver___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__baseserver___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL baseserver$(EXEEXT) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) \ - $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_0) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - client$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_2 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) \ - $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_0) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - server$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_3 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3) -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = -d __WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_7 = --define __WXUNIVERSAL__ -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_0 = -d wxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_7 = --define wxNO_EXCEPTIONS -@COND_USE_RTTI_0@__RTTI_DEFINE_p_0 = -d wxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_7 = --define wxNO_RTTI -@COND_USE_THREADS_0@__THREAD_DEFINE_p_0 = -d wxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_7 = --define wxNO_THREADS -@COND_SHARED_1@__DLLFLAG_p_0 = -d WXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_7 = --define WXUSINGDLL -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_0 = --include-dir \ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__ +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS +@COND_USE_RTTI_0@__RTTI_DEFINE_p_0 = --define wxNO_RTTI +@COND_USE_THREADS_0@__THREAD_DEFINE_p_0 = --define wxNO_THREADS +@COND_SHARED_1@__DLLFLAG_p_0 = --define WXUSINGDLL +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@os2_lib_res = $(top_srcdir)/include/wx/os2/wx.res COND_MONOLITHIC_0___WXLIB_CORE_p = \ @@ -211,8 +189,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile @COND_USE_GUI_1@client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc) -@COND_USE_GUI_1@ $(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -@COND_USE_GUI_1@ $(__client___mac_rezcmd) +@COND_USE_GUI_1@ $(CXX) -o $@ $(CLIENT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) +@COND_USE_GUI_1@ @COND_USE_GUI_1@ $(__client___mac_setfilecmd) @COND_USE_GUI_1@ $(__client___os2_emxbindcmd) @COND_USE_GUI_1@ $(SAMPLES_RPATH_POSTLINK) @@ -240,8 +218,8 @@ distclean: clean @COND_PLATFORM_MACOSX_1_USE_GUI_1@client_bundle: $(____client_BUNDLE_TGT_REF_DEP) @COND_USE_GUI_1@server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc) -@COND_USE_GUI_1@ $(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -@COND_USE_GUI_1@ $(__server___mac_rezcmd) +@COND_USE_GUI_1@ $(CXX) -o $@ $(SERVER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) +@COND_USE_GUI_1@ @COND_USE_GUI_1@ $(__server___mac_setfilecmd) @COND_USE_GUI_1@ $(__server___os2_emxbindcmd) @COND_USE_GUI_1@ $(SAMPLES_RPATH_POSTLINK) @@ -269,13 +247,13 @@ distclean: clean @COND_PLATFORM_MACOSX_1_USE_GUI_1@server_bundle: $(____server_BUNDLE_TGT_REF_DEP) baseclient$(EXEEXT): $(BASECLIENT_OBJECTS) - $(CXX) -o $@ $(BASECLIENT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) + $(CXX) -o $@ $(BASECLIENT_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) $(__baseclient___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) baseserver$(EXEEXT): $(BASESERVER_OBJECTS) - $(CXX) -o $@ $(BASESERVER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) + $(CXX) -o $@ $(BASESERVER_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) $(__baseserver___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) @@ -284,13 +262,13 @@ client_client.o: $(srcdir)/client.cpp $(CXXC) -c -o $@ $(CLIENT_CXXFLAGS) $(srcdir)/client.cpp client_client_rc.o: $(srcdir)/client.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_7) $(__EXCEPTIONS_DEFINE_p_7) $(__RTTI_DEFINE_p_7) $(__THREAD_DEFINE_p_7) --include-dir $(srcdir) $(__DLLFLAG_p_7) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_0) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include server_server.o: $(srcdir)/server.cpp $(CXXC) -c -o $@ $(SERVER_CXXFLAGS) $(srcdir)/server.cpp server_server_rc.o: $(srcdir)/server.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_7) $(__EXCEPTIONS_DEFINE_p_7) $(__RTTI_DEFINE_p_7) $(__THREAD_DEFINE_p_7) --include-dir $(srcdir) $(__DLLFLAG_p_7) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_0) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include baseclient_baseclient.o: $(srcdir)/baseclient.cpp $(CXXC) -c -o $@ $(BASECLIENT_CXXFLAGS) $(srcdir)/baseclient.cpp @@ -299,7 +277,16 @@ baseserver_baseserver.o: $(srcdir)/baseserver.cpp $(CXXC) -c -o $@ $(BASESERVER_CXXFLAGS) $(srcdir)/baseserver.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean client_bundle server_bundle diff --git a/samples/sockets/makefile.bcc b/samples/sockets/makefile.bcc index 8258b4b051..c027811826 100644 --- a/samples/sockets/makefile.bcc +++ b/samples/sockets/makefile.bcc @@ -282,25 +282,25 @@ clean: !if "$(USE_GUI)" == "1" $(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(CLIENT_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\client_client.res | !endif !if "$(USE_GUI)" == "1" $(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_server.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(SERVER_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\server_server.res | !endif $(OBJS)\baseclient.exe: $(BASECLIENT_OBJECTS) - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&| c0x32.obj $(BASECLIENT_OBJECTS),$@,, $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, | $(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS) - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&| c0x32.obj $(BASESERVER_OBJECTS),$@,, $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, | diff --git a/samples/sockets/makefile.gcc b/samples/sockets/makefile.gcc index 0523c13326..d056992a9e 100644 --- a/samples/sockets/makefile.gcc +++ b/samples/sockets/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -266,19 +266,19 @@ clean: ifeq ($(USE_GUI),1) $(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client_rc.o - $(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(CLIENT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 endif ifeq ($(USE_GUI),1) $(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_server_rc.o - $(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(SERVER_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 endif $(OBJS)\baseclient.exe: $(BASECLIENT_OBJECTS) - $(CXX) -o $@ $(BASECLIENT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(BASECLIENT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS) - $(CXX) -o $@ $(BASESERVER_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(BASESERVER_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\client_client.o: ./client.cpp $(CXX) -c -o $@ $(CLIENT_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/sockets/makefile.unx b/samples/sockets/makefile.unx index 2cbb1fd919..1082f97fcd 100644 --- a/samples/sockets/makefile.unx +++ b/samples/sockets/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -113,16 +113,16 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) client: $(CLIENT_OBJECTS) - $(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,net,base` + $(CXX) -o $@ $(CLIENT_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,net,base` $(LDFLAGS) server: $(SERVER_OBJECTS) - $(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,net,base` + $(CXX) -o $@ $(SERVER_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,net,base` $(LDFLAGS) baseclient: $(BASECLIENT_OBJECTS) - $(CXX) -o $@ $(BASECLIENT_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs net,base` + $(CXX) -o $@ $(BASECLIENT_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs net,base` $(LDFLAGS) baseserver: $(BASESERVER_OBJECTS) - $(CXX) -o $@ $(BASESERVER_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs net,base` + $(CXX) -o $@ $(BASESERVER_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs net,base` $(LDFLAGS) client_client.o: ./client.cpp $(CXX) -c -o $@ $(CLIENT_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/sockets/makefile.vc b/samples/sockets/makefile.vc index 9e70a2c53b..e09e2e175f 100644 --- a/samples/sockets/makefile.vc +++ b/samples/sockets/makefile.vc @@ -374,25 +374,25 @@ clean: !if "$(USE_GUI)" == "1" $(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_3) /pdb:"$(OBJS)\client.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /pdb:"$(OBJS)\client.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(CLIENT_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << !endif !if "$(USE_GUI)" == "1" $(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_server.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_3) /pdb:"$(OBJS)\server.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /pdb:"$(OBJS)\server.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(SERVER_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << !endif $(OBJS)\baseclient.exe: $(BASECLIENT_OBJECTS) - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_3) /pdb:"$(OBJS)\baseclient.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /pdb:"$(OBJS)\baseclient.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< $(BASECLIENT_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << $(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS) - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_3) /pdb:"$(OBJS)\baseserver.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_3) /pdb:"$(OBJS)\baseserver.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< $(BASESERVER_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/sockets/makefile.wat b/samples/sockets/makefile.wat index fad95dc00e..d5c278b294 100644 --- a/samples/sockets/makefile.wat +++ b/samples/sockets/makefile.wat @@ -293,7 +293,7 @@ $(OBJS)\client.exe : $(CLIENT_OBJECTS) $(OBJS)\client_client.res @%append $(OBJS)\client.lbc option quiet @%append $(OBJS)\client.lbc name $^@ @%append $(OBJS)\client.lbc option caseexact - @%append $(OBJS)\client.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\client.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(CLIENT_OBJECTS)) do @%append $(OBJS)\client.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\client.lbc library %i @%append $(OBJS)\client.lbc option resource=$(OBJS)\client_client.res @@ -307,7 +307,7 @@ $(OBJS)\server.exe : $(SERVER_OBJECTS) $(OBJS)\server_server.res @%append $(OBJS)\server.lbc option quiet @%append $(OBJS)\server.lbc name $^@ @%append $(OBJS)\server.lbc option caseexact - @%append $(OBJS)\server.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\server.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(SERVER_OBJECTS)) do @%append $(OBJS)\server.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\server.lbc library %i @%append $(OBJS)\server.lbc option resource=$(OBJS)\server_server.res @@ -320,7 +320,7 @@ $(OBJS)\baseclient.exe : $(BASECLIENT_OBJECTS) @%append $(OBJS)\baseclient.lbc option quiet @%append $(OBJS)\baseclient.lbc name $^@ @%append $(OBJS)\baseclient.lbc option caseexact - @%append $(OBJS)\baseclient.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_' + @%append $(OBJS)\baseclient.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) @for %i in ($(BASECLIENT_OBJECTS)) do @%append $(OBJS)\baseclient.lbc file %i @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\baseclient.lbc library %i @%append $(OBJS)\baseclient.lbc @@ -332,7 +332,7 @@ $(OBJS)\baseserver.exe : $(BASESERVER_OBJECTS) @%append $(OBJS)\baseserver.lbc option quiet @%append $(OBJS)\baseserver.lbc name $^@ @%append $(OBJS)\baseserver.lbc option caseexact - @%append $(OBJS)\baseserver.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_' + @%append $(OBJS)\baseserver.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) @for %i in ($(BASESERVER_OBJECTS)) do @%append $(OBJS)\baseserver.lbc file %i @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\baseserver.lbc library %i @%append $(OBJS)\baseserver.lbc diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in index d5f0a9c340..f72b42cf3b 100644 --- a/samples/sound/Makefile.in +++ b/samples/sound/Makefile.in @@ -146,7 +146,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile sound$(EXEEXT): $(SOUND_OBJECTS) $(__sound___win32rc) - $(CXX) -o $@ $(SOUND_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) + $(CXX) -o $@ $(SOUND_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) $(__sound___mac_setfilecmd) $(__sound___os2_emxbindcmd) @@ -203,6 +203,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ $(srcdir)/include/wx/stc/stc.h # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean sound_bundle data diff --git a/samples/sound/makefile.bcc b/samples/sound/makefile.bcc index ee48f5ed9e..bf574b8fd1 100644 --- a/samples/sound/makefile.bcc +++ b/samples/sound/makefile.bcc @@ -233,7 +233,7 @@ clean: -if exist $(OBJS)\sound.ils del $(OBJS)\sound.ils $(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sound.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(SOUND_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\sound_sound.res | diff --git a/samples/sound/makefile.gcc b/samples/sound/makefile.gcc index 5c5119e456..0f50614a91 100644 --- a/samples/sound/makefile.gcc +++ b/samples/sound/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: -if exist $(OBJS)\sound.exe del $(OBJS)\sound.exe $(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sound_rc.o - $(CXX) -o $@ $(SOUND_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(SOUND_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/samples/sound/makefile.unx b/samples/sound/makefile.unx index 85c2d8efb0..9973674bb2 100644 --- a/samples/sound/makefile.unx +++ b/samples/sound/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) sound: $(SOUND_OBJECTS) - $(CXX) -o $@ $(SOUND_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` + $(CXX) -o $@ $(SOUND_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` $(LDFLAGS) sound_sound.o: ./sound.cpp $(CXX) -c -o $@ $(SOUND_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/sound/makefile.vc b/samples/sound/makefile.vc index e2fa52c7cd..ce9e22d2fa 100644 --- a/samples/sound/makefile.vc +++ b/samples/sound/makefile.vc @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\sound.pdb del $(OBJS)\sound.pdb $(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sound.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\sound.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\sound.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(SOUND_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/sound/makefile.wat b/samples/sound/makefile.wat index 3c78104355..450e8d9b2b 100644 --- a/samples/sound/makefile.wat +++ b/samples/sound/makefile.wat @@ -256,7 +256,7 @@ $(OBJS)\sound.exe : $(SOUND_OBJECTS) $(OBJS)\sound_sound.res @%append $(OBJS)\sound.lbc option quiet @%append $(OBJS)\sound.lbc name $^@ @%append $(OBJS)\sound.lbc option caseexact - @%append $(OBJS)\sound.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\sound.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(SOUND_OBJECTS)) do @%append $(OBJS)\sound.lbc file %i @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\sound.lbc library %i @%append $(OBJS)\sound.lbc option resource=$(OBJS)\sound_sound.res diff --git a/samples/splash/Makefile.in b/samples/splash/Makefile.in index 9f99e79772..5e9d1502d3 100644 --- a/samples/splash/Makefile.in +++ b/samples/splash/Makefile.in @@ -150,7 +150,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile splash$(EXEEXT): $(SPLASH_OBJECTS) $(__splash___win32rc) - $(CXX) -o $@ $(SPLASH_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) + $(CXX) -o $@ $(SPLASH_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) $(__splash___mac_setfilecmd) $(__splash___os2_emxbindcmd) @@ -207,6 +207,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ $(srcdir)/include/wx/stc/stc.h # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean splash_bundle data diff --git a/samples/splash/makefile.bcc b/samples/splash/makefile.bcc index 441c6d138f..f9bd02a748 100644 --- a/samples/splash/makefile.bcc +++ b/samples/splash/makefile.bcc @@ -237,7 +237,7 @@ clean: -if exist $(OBJS)\splash.ils del $(OBJS)\splash.ils $(OBJS)\splash.exe: $(SPLASH_OBJECTS) $(OBJS)\splash_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(SPLASH_OBJECTS),$@,, $(__WXLIB_MEDIA_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\splash_sample.res | diff --git a/samples/splash/makefile.gcc b/samples/splash/makefile.gcc index e46da06093..5e5d37d19a 100644 --- a/samples/splash/makefile.gcc +++ b/samples/splash/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -234,7 +234,7 @@ clean: -if exist $(OBJS)\splash.exe del $(OBJS)\splash.exe $(OBJS)\splash.exe: $(SPLASH_OBJECTS) $(OBJS)\splash_sample_rc.o - $(CXX) -o $@ $(SPLASH_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_MEDIA_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(SPLASH_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_MEDIA_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/samples/splash/makefile.unx b/samples/splash/makefile.unx index 387d96fec3..c411531050 100644 --- a/samples/splash/makefile.unx +++ b/samples/splash/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) splash: $(SPLASH_OBJECTS) - $(CXX) -o $@ $(SPLASH_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs media,adv,core,base` + $(CXX) -o $@ $(SPLASH_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs media,adv,core,base` $(LDFLAGS) splash_splash.o: ./splash.cpp $(CXX) -c -o $@ $(SPLASH_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/splash/makefile.vc b/samples/splash/makefile.vc index 23735c8a8d..5f32c868a6 100644 --- a/samples/splash/makefile.vc +++ b/samples/splash/makefile.vc @@ -313,7 +313,7 @@ clean: -if exist $(OBJS)\splash.pdb del $(OBJS)\splash.pdb $(OBJS)\splash.exe: $(SPLASH_OBJECTS) $(OBJS)\splash_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\splash.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\splash.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(SPLASH_OBJECTS) $(__WXLIB_MEDIA_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/splash/makefile.wat b/samples/splash/makefile.wat index d843642ad2..e819495876 100644 --- a/samples/splash/makefile.wat +++ b/samples/splash/makefile.wat @@ -263,7 +263,7 @@ $(OBJS)\splash.exe : $(SPLASH_OBJECTS) $(OBJS)\splash_sample.res @%append $(OBJS)\splash.lbc option quiet @%append $(OBJS)\splash.lbc name $^@ @%append $(OBJS)\splash.lbc option caseexact - @%append $(OBJS)\splash.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\splash.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(SPLASH_OBJECTS)) do @%append $(OBJS)\splash.lbc file %i @for %i in ( $(__WXLIB_MEDIA_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\splash.lbc library %i @%append $(OBJS)\splash.lbc option resource=$(OBJS)\splash_sample.res diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in index 3bce91723a..7f5e9ee290 100644 --- a/samples/splitter/Makefile.in +++ b/samples/splitter/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ SPLITTER_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__splitter___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__splitter___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C splitter$(EXEEXT) -@COND_PLATFORM_MAC_1@__splitter___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL splitter$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___splitter___os2_emxbindcmd = $(NM) splitter$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep splitter$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__splitter___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___splitter___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__splitter_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - splitter$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile splitter$(EXEEXT): $(SPLITTER_OBJECTS) $(__splitter___win32rc) - $(CXX) -o $@ $(SPLITTER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__splitter___mac_rezcmd) + $(CXX) -o $@ $(SPLITTER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__splitter___mac_setfilecmd) $(__splitter___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ splitter_splitter_rc.o: $(srcdir)/splitter.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean splitter_bundle diff --git a/samples/splitter/makefile.bcc b/samples/splitter/makefile.bcc index c5255f4319..86b7db0e3c 100644 --- a/samples/splitter/makefile.bcc +++ b/samples/splitter/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(SPLITTER_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\splitter_splitter.res | diff --git a/samples/splitter/makefile.gcc b/samples/splitter/makefile.gcc index 5d5c19a112..6941b50696 100644 --- a/samples/splitter/makefile.gcc +++ b/samples/splitter/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe $(OBJS)\splitter.exe: $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter_rc.o - $(CXX) -o $@ $(SPLITTER_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(SPLITTER_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\splitter_splitter.o: ./splitter.cpp $(CXX) -c -o $@ $(SPLITTER_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/splitter/makefile.unx b/samples/splitter/makefile.unx index a9c46c7f3b..0198c96c56 100644 --- a/samples/splitter/makefile.unx +++ b/samples/splitter/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) splitter: $(SPLITTER_OBJECTS) - $(CXX) -o $@ $(SPLITTER_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(SPLITTER_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) splitter_splitter.o: ./splitter.cpp $(CXX) -c -o $@ $(SPLITTER_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/splitter/makefile.vc b/samples/splitter/makefile.vc index 4fa949c51c..8d23d7e844 100644 --- a/samples/splitter/makefile.vc +++ b/samples/splitter/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\splitter.pdb del $(OBJS)\splitter.pdb $(OBJS)\splitter.exe: $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\splitter.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\splitter.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(SPLITTER_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/splitter/makefile.wat b/samples/splitter/makefile.wat index 326da88654..7ea2cb5728 100644 --- a/samples/splitter/makefile.wat +++ b/samples/splitter/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\splitter.exe : $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter.res @%append $(OBJS)\splitter.lbc option quiet @%append $(OBJS)\splitter.lbc name $^@ @%append $(OBJS)\splitter.lbc option caseexact - @%append $(OBJS)\splitter.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\splitter.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(SPLITTER_OBJECTS)) do @%append $(OBJS)\splitter.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\splitter.lbc library %i @%append $(OBJS)\splitter.lbc option resource=$(OBJS)\splitter_splitter.res diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in index 985ced91fc..3f614bad26 100644 --- a/samples/statbar/Makefile.in +++ b/samples/statbar/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ STATBAR_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__statbar___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__statbar___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C statbar$(EXEEXT) -@COND_PLATFORM_MAC_1@__statbar___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL statbar$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___statbar___os2_emxbindcmd = $(NM) statbar$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep statbar$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__statbar___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___statbar___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__statbar_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - statbar$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile statbar$(EXEEXT): $(STATBAR_OBJECTS) $(__statbar___win32rc) - $(CXX) -o $@ $(STATBAR_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__statbar___mac_rezcmd) + $(CXX) -o $@ $(STATBAR_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__statbar___mac_setfilecmd) $(__statbar___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ statbar_statbar_rc.o: $(srcdir)/statbar.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean statbar_bundle diff --git a/samples/statbar/makefile.bcc b/samples/statbar/makefile.bcc index a0661b8ca5..4c752efdc7 100644 --- a/samples/statbar/makefile.bcc +++ b/samples/statbar/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(STATBAR_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\statbar_statbar.res | diff --git a/samples/statbar/makefile.gcc b/samples/statbar/makefile.gcc index 6951cba916..ea2e917fce 100644 --- a/samples/statbar/makefile.gcc +++ b/samples/statbar/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe $(OBJS)\statbar.exe: $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar_rc.o - $(CXX) -o $@ $(STATBAR_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(STATBAR_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\statbar_statbar.o: ./statbar.cpp $(CXX) -c -o $@ $(STATBAR_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/statbar/makefile.unx b/samples/statbar/makefile.unx index 4f3d1629ed..97eed44e73 100644 --- a/samples/statbar/makefile.unx +++ b/samples/statbar/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) statbar: $(STATBAR_OBJECTS) - $(CXX) -o $@ $(STATBAR_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(STATBAR_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) statbar_statbar.o: ./statbar.cpp $(CXX) -c -o $@ $(STATBAR_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/statbar/makefile.vc b/samples/statbar/makefile.vc index 50112f97c9..32dde6d692 100644 --- a/samples/statbar/makefile.vc +++ b/samples/statbar/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\statbar.pdb del $(OBJS)\statbar.pdb $(OBJS)\statbar.exe: $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\statbar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\statbar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(STATBAR_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/statbar/makefile.wat b/samples/statbar/makefile.wat index 32881c6208..b90928c1aa 100644 --- a/samples/statbar/makefile.wat +++ b/samples/statbar/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\statbar.exe : $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar.res @%append $(OBJS)\statbar.lbc option quiet @%append $(OBJS)\statbar.lbc name $^@ @%append $(OBJS)\statbar.lbc option caseexact - @%append $(OBJS)\statbar.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\statbar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(STATBAR_OBJECTS)) do @%append $(OBJS)\statbar.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\statbar.lbc library %i @%append $(OBJS)\statbar.lbc option resource=$(OBJS)\statbar_statbar.res diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in index fc038c3b64..3633e9efff 100644 --- a/samples/stc/Makefile.in +++ b/samples/stc/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -72,28 +71,20 @@ STCTEST_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__stctest___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__stctest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C stctest$(EXEEXT) -@COND_PLATFORM_MAC_1@__stctest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL stctest$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___stctest___os2_emxbindcmd = $(NM) stctest$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep stctest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__stctest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___stctest___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__stctest_os2_lib_res = \ @@ -134,12 +125,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - stctest$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -161,8 +146,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc) - $(CXX) -o $@ $(STCTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_STC_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__stctest___mac_rezcmd) + $(CXX) -o $@ $(STCTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_STC_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__stctest___mac_setfilecmd) $(__stctest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -214,7 +199,16 @@ stctest_sample_rc.o: $(srcdir)/../sample.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean stctest_bundle data diff --git a/samples/stc/makefile.bcc b/samples/stc/makefile.bcc index 61643738cd..c4d70f93cf 100644 --- a/samples/stc/makefile.bcc +++ b/samples/stc/makefile.bcc @@ -235,7 +235,7 @@ clean: -if exist $(OBJS)\stctest.ils del $(OBJS)\stctest.ils $(OBJS)\stctest.exe: $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(STCTEST_OBJECTS),$@,, $(__WXLIB_STC_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxscintilla$(WXDEBUGFLAG).lib $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\stctest_sample.res | diff --git a/samples/stc/makefile.gcc b/samples/stc/makefile.gcc index 13eabbffd3..de078b44be 100644 --- a/samples/stc/makefile.gcc +++ b/samples/stc/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -230,7 +230,7 @@ clean: -if exist $(OBJS)\stctest.exe del $(OBJS)\stctest.exe $(OBJS)\stctest.exe: $(STCTEST_OBJECTS) $(OBJS)\stctest_sample_rc.o - $(CXX) -o $@ $(STCTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_STC_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(STCTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_STC_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/samples/stc/makefile.unx b/samples/stc/makefile.unx index 13e325a6ce..3dc96554cb 100644 --- a/samples/stc/makefile.unx +++ b/samples/stc/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -100,7 +100,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) stctest: $(STCTEST_OBJECTS) - $(CXX) -o $@ $(STCTEST_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs stc,core,base` + $(CXX) -o $@ $(STCTEST_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs stc,core,base` $(LDFLAGS) stctest_stctest.o: ./stctest.cpp $(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/stc/makefile.vc b/samples/stc/makefile.vc index 4b1ca89630..4db29942e7 100644 --- a/samples/stc/makefile.vc +++ b/samples/stc/makefile.vc @@ -311,7 +311,7 @@ clean: -if exist $(OBJS)\stctest.pdb del $(OBJS)\stctest.pdb $(OBJS)\stctest.exe: $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\stctest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\stctest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(STCTEST_OBJECTS) $(__WXLIB_STC_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxscintilla$(WXDEBUGFLAG).lib $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/stc/makefile.wat b/samples/stc/makefile.wat index cfc939d7cc..0fe9c89fae 100644 --- a/samples/stc/makefile.wat +++ b/samples/stc/makefile.wat @@ -258,7 +258,7 @@ $(OBJS)\stctest.exe : $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res @%append $(OBJS)\stctest.lbc option quiet @%append $(OBJS)\stctest.lbc name $^@ @%append $(OBJS)\stctest.lbc option caseexact - @%append $(OBJS)\stctest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\stctest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(STCTEST_OBJECTS)) do @%append $(OBJS)\stctest.lbc file %i @for %i in ( $(__WXLIB_STC_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxscintilla$(WXDEBUGFLAG).lib $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\stctest.lbc library %i @%append $(OBJS)\stctest.lbc option resource=$(OBJS)\stctest_sample.res diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in index 179ce9f591..04ce54926b 100644 --- a/samples/svg/Makefile.in +++ b/samples/svg/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ SVGTEST_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__svgtest___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__svgtest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C svgtest$(EXEEXT) -@COND_PLATFORM_MAC_1@__svgtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL svgtest$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___svgtest___os2_emxbindcmd = $(NM) svgtest$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep svgtest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__svgtest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___svgtest___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__svgtest___win32rc = svgtest_sample_rc.o @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - svgtest$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc) - $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__svgtest___mac_rezcmd) + $(CXX) -o $@ $(SVGTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__svgtest___mac_setfilecmd) $(__svgtest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ svgtest_svgtest.o: $(srcdir)/svgtest.cpp $(CXXC) -c -o $@ $(SVGTEST_CXXFLAGS) $(srcdir)/svgtest.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean svgtest_bundle diff --git a/samples/svg/makefile.bcc b/samples/svg/makefile.bcc index 39e899be42..e21c193d76 100644 --- a/samples/svg/makefile.bcc +++ b/samples/svg/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(SVGTEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\svgtest_sample.res | diff --git a/samples/svg/makefile.gcc b/samples/svg/makefile.gcc index d82563549c..b94be97a4f 100644 --- a/samples/svg/makefile.gcc +++ b/samples/svg/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample_rc.o - $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(SVGTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\svgtest_sample_rc.o: ./../../samples/sample.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH diff --git a/samples/svg/makefile.unx b/samples/svg/makefile.unx index c7a41b439a..2e2c3170f0 100644 --- a/samples/svg/makefile.unx +++ b/samples/svg/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) svgtest: $(SVGTEST_OBJECTS) - $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(SVGTEST_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) svgtest_svgtest.o: ./svgtest.cpp $(CXX) -c -o $@ $(SVGTEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/svg/makefile.vc b/samples/svg/makefile.vc index 8fa7fcc765..87037fe9eb 100644 --- a/samples/svg/makefile.vc +++ b/samples/svg/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\svgtest.pdb del $(OBJS)\svgtest.pdb $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\svgtest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\svgtest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(SVGTEST_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/svg/makefile.wat b/samples/svg/makefile.wat index e2a437aceb..2dbe481f9e 100644 --- a/samples/svg/makefile.wat +++ b/samples/svg/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\svgtest.exe : $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res @%append $(OBJS)\svgtest.lbc option quiet @%append $(OBJS)\svgtest.lbc name $^@ @%append $(OBJS)\svgtest.lbc option caseexact - @%append $(OBJS)\svgtest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\svgtest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(SVGTEST_OBJECTS)) do @%append $(OBJS)\svgtest.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\svgtest.lbc library %i @%append $(OBJS)\svgtest.lbc option resource=$(OBJS)\svgtest_sample.res diff --git a/samples/taborder/Makefile.in b/samples/taborder/Makefile.in index 13d2c77403..d72eed203d 100644 --- a/samples/taborder/Makefile.in +++ b/samples/taborder/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ TABORDER_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__taborder___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__taborder___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C taborder$(EXEEXT) -@COND_PLATFORM_MAC_1@__taborder___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL taborder$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___taborder___os2_emxbindcmd = $(NM) taborder$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep taborder$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__taborder___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___taborder___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__taborder___win32rc = taborder_sample_rc.o @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - taborder$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile taborder$(EXEEXT): $(TABORDER_OBJECTS) $(__taborder___win32rc) - $(CXX) -o $@ $(TABORDER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__taborder___mac_rezcmd) + $(CXX) -o $@ $(TABORDER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__taborder___mac_setfilecmd) $(__taborder___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ taborder_taborder.o: $(srcdir)/taborder.cpp $(CXXC) -c -o $@ $(TABORDER_CXXFLAGS) $(srcdir)/taborder.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean taborder_bundle diff --git a/samples/taborder/makefile.bcc b/samples/taborder/makefile.bcc index c1b9f80de7..54ac119d6e 100644 --- a/samples/taborder/makefile.bcc +++ b/samples/taborder/makefile.bcc @@ -229,7 +229,7 @@ clean: -if exist $(OBJS)\taborder.ils del $(OBJS)\taborder.ils $(OBJS)\taborder.exe: $(TABORDER_OBJECTS) $(OBJS)\taborder_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(TABORDER_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\taborder_sample.res | diff --git a/samples/taborder/makefile.gcc b/samples/taborder/makefile.gcc index 0ccbb2fb53..25bc081970 100644 --- a/samples/taborder/makefile.gcc +++ b/samples/taborder/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\taborder.exe del $(OBJS)\taborder.exe $(OBJS)\taborder.exe: $(TABORDER_OBJECTS) $(OBJS)\taborder_sample_rc.o - $(CXX) -o $@ $(TABORDER_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(TABORDER_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\taborder_sample_rc.o: ./../../samples/sample.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH diff --git a/samples/taborder/makefile.unx b/samples/taborder/makefile.unx index 2cdc315267..bf787120c6 100644 --- a/samples/taborder/makefile.unx +++ b/samples/taborder/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) taborder: $(TABORDER_OBJECTS) - $(CXX) -o $@ $(TABORDER_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(TABORDER_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) taborder_taborder.o: ./taborder.cpp $(CXX) -c -o $@ $(TABORDER_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/taborder/makefile.vc b/samples/taborder/makefile.vc index 12025c70ba..83c7dd64b5 100644 --- a/samples/taborder/makefile.vc +++ b/samples/taborder/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\taborder.pdb del $(OBJS)\taborder.pdb $(OBJS)\taborder.exe: $(TABORDER_OBJECTS) $(OBJS)\taborder_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\taborder.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\taborder.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(TABORDER_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/taborder/makefile.wat b/samples/taborder/makefile.wat index 2816feb2f5..f9806f22e5 100644 --- a/samples/taborder/makefile.wat +++ b/samples/taborder/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\taborder.exe : $(TABORDER_OBJECTS) $(OBJS)\taborder_sample.res @%append $(OBJS)\taborder.lbc option quiet @%append $(OBJS)\taborder.lbc name $^@ @%append $(OBJS)\taborder.lbc option caseexact - @%append $(OBJS)\taborder.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\taborder.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(TABORDER_OBJECTS)) do @%append $(OBJS)\taborder.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\taborder.lbc library %i @%append $(OBJS)\taborder.lbc option resource=$(OBJS)\taborder_sample.res diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in index ab6beeaf02..8105b5e79b 100644 --- a/samples/taskbar/Makefile.in +++ b/samples/taskbar/Makefile.in @@ -146,7 +146,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile taskbar$(EXEEXT): $(TASKBAR_OBJECTS) $(__taskbar___win32rc) - $(CXX) -o $@ $(TASKBAR_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) + $(CXX) -o $@ $(TASKBAR_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) $(__taskbar___mac_setfilecmd) $(__taskbar___os2_emxbindcmd) @@ -191,6 +191,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ $(srcdir)/include/wx/stc/stc.h # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean taskbar_bundle diff --git a/samples/taskbar/makefile.bcc b/samples/taskbar/makefile.bcc index b96112cb23..281894e39c 100644 --- a/samples/taskbar/makefile.bcc +++ b/samples/taskbar/makefile.bcc @@ -233,7 +233,7 @@ clean: -if exist $(OBJS)\taskbar.ils del $(OBJS)\taskbar.ils $(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\taskbar_sample.res | diff --git a/samples/taskbar/makefile.gcc b/samples/taskbar/makefile.gcc index a2cfa5c64d..b5b98287d0 100644 --- a/samples/taskbar/makefile.gcc +++ b/samples/taskbar/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: -if exist $(OBJS)\taskbar.exe del $(OBJS)\taskbar.exe $(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample_rc.o - $(CXX) -o $@ $(TASKBAR_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(TASKBAR_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\taskbar_sample_rc.o: ./../../samples/sample.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH diff --git a/samples/taskbar/makefile.unx b/samples/taskbar/makefile.unx index d748ec0b10..9f61518ed3 100644 --- a/samples/taskbar/makefile.unx +++ b/samples/taskbar/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) taskbar: $(TASKBAR_OBJECTS) - $(CXX) -o $@ $(TASKBAR_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` + $(CXX) -o $@ $(TASKBAR_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` $(LDFLAGS) taskbar_tbtest.o: ./tbtest.cpp $(CXX) -c -o $@ $(TASKBAR_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/taskbar/makefile.vc b/samples/taskbar/makefile.vc index dfc13b755e..d7a66644d2 100644 --- a/samples/taskbar/makefile.vc +++ b/samples/taskbar/makefile.vc @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\taskbar.pdb del $(OBJS)\taskbar.pdb $(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\taskbar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\taskbar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/taskbar/makefile.wat b/samples/taskbar/makefile.wat index 3d130fadaa..c38bfe8caa 100644 --- a/samples/taskbar/makefile.wat +++ b/samples/taskbar/makefile.wat @@ -256,7 +256,7 @@ $(OBJS)\taskbar.exe : $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample.res @%append $(OBJS)\taskbar.lbc option quiet @%append $(OBJS)\taskbar.lbc name $^@ @%append $(OBJS)\taskbar.lbc option caseexact - @%append $(OBJS)\taskbar.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\taskbar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(TASKBAR_OBJECTS)) do @%append $(OBJS)\taskbar.lbc file %i @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\taskbar.lbc library %i @%append $(OBJS)\taskbar.lbc option resource=$(OBJS)\taskbar_sample.res diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in index a1b2d59087..e746aa6540 100644 --- a/samples/text/Makefile.in +++ b/samples/text/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ TEXT_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__text___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__text___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C text$(EXEEXT) -@COND_PLATFORM_MAC_1@__text___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL text$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___text___os2_emxbindcmd = $(NM) text$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep text$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__text___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___text___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__text_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - text$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile text$(EXEEXT): $(TEXT_OBJECTS) $(__text___win32rc) - $(CXX) -o $@ $(TEXT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__text___mac_rezcmd) + $(CXX) -o $@ $(TEXT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__text___mac_setfilecmd) $(__text___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ text_text_rc.o: $(srcdir)/text.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean text_bundle diff --git a/samples/text/makefile.bcc b/samples/text/makefile.bcc index 3e06be73f7..2a47487deb 100644 --- a/samples/text/makefile.bcc +++ b/samples/text/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(TEXT_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\text_text.res | diff --git a/samples/text/makefile.gcc b/samples/text/makefile.gcc index 57b11b9c80..727c2816b9 100644 --- a/samples/text/makefile.gcc +++ b/samples/text/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\text.exe del $(OBJS)\text.exe $(OBJS)\text.exe: $(TEXT_OBJECTS) $(OBJS)\text_text_rc.o - $(CXX) -o $@ $(TEXT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(TEXT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\text_text.o: ./text.cpp $(CXX) -c -o $@ $(TEXT_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/text/makefile.unx b/samples/text/makefile.unx index 4755f2e26d..3862608f81 100644 --- a/samples/text/makefile.unx +++ b/samples/text/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) text: $(TEXT_OBJECTS) - $(CXX) -o $@ $(TEXT_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(TEXT_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) text_text.o: ./text.cpp $(CXX) -c -o $@ $(TEXT_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/text/makefile.vc b/samples/text/makefile.vc index df6fc4ed24..37a7d7a61f 100644 --- a/samples/text/makefile.vc +++ b/samples/text/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\text.pdb del $(OBJS)\text.pdb $(OBJS)\text.exe: $(TEXT_OBJECTS) $(OBJS)\text_text.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\text.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\text.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(TEXT_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/text/makefile.wat b/samples/text/makefile.wat index f1c768ad2b..e7bfa4707e 100644 --- a/samples/text/makefile.wat +++ b/samples/text/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\text.exe : $(TEXT_OBJECTS) $(OBJS)\text_text.res @%append $(OBJS)\text.lbc option quiet @%append $(OBJS)\text.lbc name $^@ @%append $(OBJS)\text.lbc option caseexact - @%append $(OBJS)\text.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\text.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(TEXT_OBJECTS)) do @%append $(OBJS)\text.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\text.lbc library %i @%append $(OBJS)\text.lbc option resource=$(OBJS)\text_text.res diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in index 30c5b00527..d3f502edfa 100644 --- a/samples/thread/Makefile.in +++ b/samples/thread/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ THREAD_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__thread___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__thread___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C thread$(EXEEXT) -@COND_PLATFORM_MAC_1@__thread___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL thread$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___thread___os2_emxbindcmd = $(NM) thread$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep thread$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__thread___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___thread___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__thread_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - thread$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile thread$(EXEEXT): $(THREAD_OBJECTS) $(__thread___win32rc) - $(CXX) -o $@ $(THREAD_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__thread___mac_rezcmd) + $(CXX) -o $@ $(THREAD_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__thread___mac_setfilecmd) $(__thread___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ thread_thread_rc.o: $(srcdir)/thread.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean thread_bundle diff --git a/samples/thread/makefile.bcc b/samples/thread/makefile.bcc index 403aa261dd..827b957959 100644 --- a/samples/thread/makefile.bcc +++ b/samples/thread/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(THREAD_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\thread_thread.res | diff --git a/samples/thread/makefile.gcc b/samples/thread/makefile.gcc index 2836b42d72..2333a1119d 100644 --- a/samples/thread/makefile.gcc +++ b/samples/thread/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe $(OBJS)\thread.exe: $(THREAD_OBJECTS) $(OBJS)\thread_thread_rc.o - $(CXX) -o $@ $(THREAD_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(THREAD_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\thread_thread.o: ./thread.cpp $(CXX) -c -o $@ $(THREAD_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/thread/makefile.unx b/samples/thread/makefile.unx index 7379149b87..b34bf19420 100644 --- a/samples/thread/makefile.unx +++ b/samples/thread/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) thread: $(THREAD_OBJECTS) - $(CXX) -o $@ $(THREAD_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(THREAD_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) thread_thread.o: ./thread.cpp $(CXX) -c -o $@ $(THREAD_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/thread/makefile.vc b/samples/thread/makefile.vc index e1a0a5adfd..bee6942003 100644 --- a/samples/thread/makefile.vc +++ b/samples/thread/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\thread.pdb del $(OBJS)\thread.pdb $(OBJS)\thread.exe: $(THREAD_OBJECTS) $(OBJS)\thread_thread.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\thread.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\thread.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(THREAD_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/thread/makefile.wat b/samples/thread/makefile.wat index 7afb504dd8..42039b6101 100644 --- a/samples/thread/makefile.wat +++ b/samples/thread/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\thread.exe : $(THREAD_OBJECTS) $(OBJS)\thread_thread.res @%append $(OBJS)\thread.lbc option quiet @%append $(OBJS)\thread.lbc name $^@ @%append $(OBJS)\thread.lbc option caseexact - @%append $(OBJS)\thread.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\thread.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(THREAD_OBJECTS)) do @%append $(OBJS)\thread.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\thread.lbc library %i @%append $(OBJS)\thread.lbc option resource=$(OBJS)\thread_thread.res diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in index ab8653d44b..db16047381 100644 --- a/samples/toolbar/Makefile.in +++ b/samples/toolbar/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ TOOLBAR_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__toolbar___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__toolbar___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C toolbar$(EXEEXT) -@COND_PLATFORM_MAC_1@__toolbar___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL toolbar$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___toolbar___os2_emxbindcmd = $(NM) toolbar$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep toolbar$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__toolbar___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___toolbar___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__toolbar_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - toolbar$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile toolbar$(EXEEXT): $(TOOLBAR_OBJECTS) $(__toolbar___win32rc) - $(CXX) -o $@ $(TOOLBAR_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__toolbar___mac_rezcmd) + $(CXX) -o $@ $(TOOLBAR_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__toolbar___mac_setfilecmd) $(__toolbar___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ toolbar_toolbar_rc.o: $(srcdir)/toolbar.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean toolbar_bundle diff --git a/samples/toolbar/makefile.bcc b/samples/toolbar/makefile.bcc index cf0e8a2017..d615ab3dc9 100644 --- a/samples/toolbar/makefile.bcc +++ b/samples/toolbar/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\toolbar_toolbar.res | diff --git a/samples/toolbar/makefile.gcc b/samples/toolbar/makefile.gcc index eab1224f7d..81bd859750 100644 --- a/samples/toolbar/makefile.gcc +++ b/samples/toolbar/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\toolbar.exe del $(OBJS)\toolbar.exe $(OBJS)\toolbar.exe: $(TOOLBAR_OBJECTS) $(OBJS)\toolbar_toolbar_rc.o - $(CXX) -o $@ $(TOOLBAR_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(TOOLBAR_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\toolbar_toolbar.o: ./toolbar.cpp $(CXX) -c -o $@ $(TOOLBAR_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/toolbar/makefile.unx b/samples/toolbar/makefile.unx index b643d57b8e..7560a40954 100644 --- a/samples/toolbar/makefile.unx +++ b/samples/toolbar/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) toolbar: $(TOOLBAR_OBJECTS) - $(CXX) -o $@ $(TOOLBAR_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(TOOLBAR_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) toolbar_toolbar.o: ./toolbar.cpp $(CXX) -c -o $@ $(TOOLBAR_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/toolbar/makefile.vc b/samples/toolbar/makefile.vc index 1e66910136..c97eefa251 100644 --- a/samples/toolbar/makefile.vc +++ b/samples/toolbar/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\toolbar.pdb del $(OBJS)\toolbar.pdb $(OBJS)\toolbar.exe: $(TOOLBAR_OBJECTS) $(OBJS)\toolbar_toolbar.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\toolbar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\toolbar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(TOOLBAR_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/toolbar/makefile.wat b/samples/toolbar/makefile.wat index c089cdad53..bf1196a64b 100644 --- a/samples/toolbar/makefile.wat +++ b/samples/toolbar/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\toolbar.exe : $(TOOLBAR_OBJECTS) $(OBJS)\toolbar_toolbar.res @%append $(OBJS)\toolbar.lbc option quiet @%append $(OBJS)\toolbar.lbc name $^@ @%append $(OBJS)\toolbar.lbc option caseexact - @%append $(OBJS)\toolbar.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\toolbar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(TOOLBAR_OBJECTS)) do @%append $(OBJS)\toolbar.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\toolbar.lbc library %i @%append $(OBJS)\toolbar.lbc option resource=$(OBJS)\toolbar_toolbar.res diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in index e4ffe589cc..a885a2f1e7 100644 --- a/samples/treectrl/Makefile.in +++ b/samples/treectrl/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ TREECTRL_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__treectrl___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__treectrl___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C treectrl$(EXEEXT) -@COND_PLATFORM_MAC_1@__treectrl___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL treectrl$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___treectrl___os2_emxbindcmd = $(NM) treectrl$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep treectrl$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__treectrl___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___treectrl___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__treectrl_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - treectrl$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile treectrl$(EXEEXT): $(TREECTRL_OBJECTS) $(__treectrl___win32rc) - $(CXX) -o $@ $(TREECTRL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__treectrl___mac_rezcmd) + $(CXX) -o $@ $(TREECTRL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__treectrl___mac_setfilecmd) $(__treectrl___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ treectrl_sample_rc.o: $(srcdir)/../sample.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean treectrl_bundle diff --git a/samples/treectrl/makefile.bcc b/samples/treectrl/makefile.bcc index 412e137370..3dc10f8242 100644 --- a/samples/treectrl/makefile.bcc +++ b/samples/treectrl/makefile.bcc @@ -229,7 +229,7 @@ clean: -if exist $(OBJS)\treectrl.ils del $(OBJS)\treectrl.ils $(OBJS)\treectrl.exe: $(TREECTRL_OBJECTS) $(OBJS)\treectrl_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\treectrl_sample.res | diff --git a/samples/treectrl/makefile.gcc b/samples/treectrl/makefile.gcc index 7f92022d59..77e3585643 100644 --- a/samples/treectrl/makefile.gcc +++ b/samples/treectrl/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\treectrl.exe del $(OBJS)\treectrl.exe $(OBJS)\treectrl.exe: $(TREECTRL_OBJECTS) $(OBJS)\treectrl_sample_rc.o - $(CXX) -o $@ $(TREECTRL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(TREECTRL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\treectrl_treetest.o: ./treetest.cpp $(CXX) -c -o $@ $(TREECTRL_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/treectrl/makefile.unx b/samples/treectrl/makefile.unx index 10d4ced0d3..f5dc7c4f09 100644 --- a/samples/treectrl/makefile.unx +++ b/samples/treectrl/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) treectrl: $(TREECTRL_OBJECTS) - $(CXX) -o $@ $(TREECTRL_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(TREECTRL_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) treectrl_treetest.o: ./treetest.cpp $(CXX) -c -o $@ $(TREECTRL_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/treectrl/makefile.vc b/samples/treectrl/makefile.vc index 75e85fd2e1..0f5f1fa7ae 100644 --- a/samples/treectrl/makefile.vc +++ b/samples/treectrl/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\treectrl.pdb del $(OBJS)\treectrl.pdb $(OBJS)\treectrl.exe: $(TREECTRL_OBJECTS) $(OBJS)\treectrl_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\treectrl.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\treectrl.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(TREECTRL_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/treectrl/makefile.wat b/samples/treectrl/makefile.wat index 0496ce29c4..5d079f6ecf 100644 --- a/samples/treectrl/makefile.wat +++ b/samples/treectrl/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\treectrl.exe : $(TREECTRL_OBJECTS) $(OBJS)\treectrl_sample.res @%append $(OBJS)\treectrl.lbc option quiet @%append $(OBJS)\treectrl.lbc name $^@ @%append $(OBJS)\treectrl.lbc option caseexact - @%append $(OBJS)\treectrl.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\treectrl.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(TREECTRL_OBJECTS)) do @%append $(OBJS)\treectrl.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\treectrl.lbc library %i @%append $(OBJS)\treectrl.lbc option resource=$(OBJS)\treectrl_sample.res diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in index 373681d53b..babc5d8d4c 100644 --- a/samples/typetest/Makefile.in +++ b/samples/typetest/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ TYPETEST_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__typetest___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__typetest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C typetest$(EXEEXT) -@COND_PLATFORM_MAC_1@__typetest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL typetest$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___typetest___os2_emxbindcmd = $(NM) typetest$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep typetest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__typetest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___typetest___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__typetest_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - typetest$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile typetest$(EXEEXT): $(TYPETEST_OBJECTS) $(__typetest___win32rc) - $(CXX) -o $@ $(TYPETEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__typetest___mac_rezcmd) + $(CXX) -o $@ $(TYPETEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__typetest___mac_setfilecmd) $(__typetest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ typetest_typetest_rc.o: $(srcdir)/typetest.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean typetest_bundle diff --git a/samples/typetest/makefile.bcc b/samples/typetest/makefile.bcc index 5496bd69ba..fa6ab0257e 100644 --- a/samples/typetest/makefile.bcc +++ b/samples/typetest/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(TYPETEST_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\typetest_typetest.res | diff --git a/samples/typetest/makefile.gcc b/samples/typetest/makefile.gcc index 6771984eee..8d603abbc4 100644 --- a/samples/typetest/makefile.gcc +++ b/samples/typetest/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe $(OBJS)\typetest.exe: $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest_rc.o - $(CXX) -o $@ $(TYPETEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(TYPETEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\typetest_typetest.o: ./typetest.cpp $(CXX) -c -o $@ $(TYPETEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/typetest/makefile.unx b/samples/typetest/makefile.unx index 2e6c1f9302..6ef0bf8b77 100644 --- a/samples/typetest/makefile.unx +++ b/samples/typetest/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) typetest: $(TYPETEST_OBJECTS) - $(CXX) -o $@ $(TYPETEST_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(TYPETEST_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) typetest_typetest.o: ./typetest.cpp $(CXX) -c -o $@ $(TYPETEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/typetest/makefile.vc b/samples/typetest/makefile.vc index 43f0f3a9a8..120990c7f8 100644 --- a/samples/typetest/makefile.vc +++ b/samples/typetest/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\typetest.pdb del $(OBJS)\typetest.pdb $(OBJS)\typetest.exe: $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\typetest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\typetest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(TYPETEST_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/typetest/makefile.wat b/samples/typetest/makefile.wat index 867b5c475a..30d4011bd2 100644 --- a/samples/typetest/makefile.wat +++ b/samples/typetest/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\typetest.exe : $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest.res @%append $(OBJS)\typetest.lbc option quiet @%append $(OBJS)\typetest.lbc name $^@ @%append $(OBJS)\typetest.lbc option caseexact - @%append $(OBJS)\typetest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\typetest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(TYPETEST_OBJECTS)) do @%append $(OBJS)\typetest.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\typetest.lbc library %i @%append $(OBJS)\typetest.lbc option resource=$(OBJS)\typetest_typetest.res diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in index 2708cf9102..72879b8ecc 100644 --- a/samples/validate/Makefile.in +++ b/samples/validate/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ VALIDATE_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__validate___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__validate___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C validate$(EXEEXT) -@COND_PLATFORM_MAC_1@__validate___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL validate$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___validate___os2_emxbindcmd = $(NM) validate$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep validate$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__validate___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___validate___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__validate_os2_lib_res = \ @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - validate$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile validate$(EXEEXT): $(VALIDATE_OBJECTS) $(__validate___win32rc) - $(CXX) -o $@ $(VALIDATE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__validate___mac_rezcmd) + $(CXX) -o $@ $(VALIDATE_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__validate___mac_setfilecmd) $(__validate___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ validate_sample_rc.o: $(srcdir)/../sample.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean validate_bundle diff --git a/samples/validate/makefile.bcc b/samples/validate/makefile.bcc index fa3d1a2724..998fc00e8d 100644 --- a/samples/validate/makefile.bcc +++ b/samples/validate/makefile.bcc @@ -229,7 +229,7 @@ clean: -if exist $(OBJS)\validate.ils del $(OBJS)\validate.ils $(OBJS)\validate.exe: $(VALIDATE_OBJECTS) $(OBJS)\validate_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\validate_sample.res | diff --git a/samples/validate/makefile.gcc b/samples/validate/makefile.gcc index 40de589e79..92129ea03d 100644 --- a/samples/validate/makefile.gcc +++ b/samples/validate/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\validate.exe del $(OBJS)\validate.exe $(OBJS)\validate.exe: $(VALIDATE_OBJECTS) $(OBJS)\validate_sample_rc.o - $(CXX) -o $@ $(VALIDATE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(VALIDATE_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\validate_validate.o: ./validate.cpp $(CXX) -c -o $@ $(VALIDATE_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/validate/makefile.unx b/samples/validate/makefile.unx index 9f6be34eae..af298e1b58 100644 --- a/samples/validate/makefile.unx +++ b/samples/validate/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) validate: $(VALIDATE_OBJECTS) - $(CXX) -o $@ $(VALIDATE_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(VALIDATE_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) validate_validate.o: ./validate.cpp $(CXX) -c -o $@ $(VALIDATE_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/validate/makefile.vc b/samples/validate/makefile.vc index f43b8bd581..bdfd33542d 100644 --- a/samples/validate/makefile.vc +++ b/samples/validate/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\validate.pdb del $(OBJS)\validate.pdb $(OBJS)\validate.exe: $(VALIDATE_OBJECTS) $(OBJS)\validate_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\validate.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\validate.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(VALIDATE_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/validate/makefile.wat b/samples/validate/makefile.wat index dec500d9d1..1dffaa8eca 100644 --- a/samples/validate/makefile.wat +++ b/samples/validate/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\validate.exe : $(VALIDATE_OBJECTS) $(OBJS)\validate_sample.res @%append $(OBJS)\validate.lbc option quiet @%append $(OBJS)\validate.lbc name $^@ @%append $(OBJS)\validate.lbc option caseexact - @%append $(OBJS)\validate.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\validate.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(VALIDATE_OBJECTS)) do @%append $(OBJS)\validate.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\validate.lbc library %i @%append $(OBJS)\validate.lbc option resource=$(OBJS)\validate_sample.res diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in index fffec4b01d..85be4c8725 100644 --- a/samples/vscroll/Makefile.in +++ b/samples/vscroll/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ VSTEST_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__vstest___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__vstest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C vstest$(EXEEXT) -@COND_PLATFORM_MAC_1@__vstest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL vstest$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___vstest___os2_emxbindcmd = $(NM) vstest$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep vstest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__vstest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___vstest___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__vstest___win32rc = vstest_sample_rc.o @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - vstest$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile vstest$(EXEEXT): $(VSTEST_OBJECTS) $(__vstest___win32rc) - $(CXX) -o $@ $(VSTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__vstest___mac_rezcmd) + $(CXX) -o $@ $(VSTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__vstest___mac_setfilecmd) $(__vstest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ vstest_vstest.o: $(srcdir)/vstest.cpp $(CXXC) -c -o $@ $(VSTEST_CXXFLAGS) $(srcdir)/vstest.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean vstest_bundle diff --git a/samples/vscroll/makefile.bcc b/samples/vscroll/makefile.bcc index 9db59a6f2f..3494dd7689 100644 --- a/samples/vscroll/makefile.bcc +++ b/samples/vscroll/makefile.bcc @@ -229,7 +229,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\vstest_sample.res | diff --git a/samples/vscroll/makefile.gcc b/samples/vscroll/makefile.gcc index 8f24818950..d21148dd37 100644 --- a/samples/vscroll/makefile.gcc +++ b/samples/vscroll/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\vstest.exe del $(OBJS)\vstest.exe $(OBJS)\vstest.exe: $(VSTEST_OBJECTS) $(OBJS)\vstest_sample_rc.o - $(CXX) -o $@ $(VSTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(VSTEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\vstest_sample_rc.o: ./../../samples/sample.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH diff --git a/samples/vscroll/makefile.unx b/samples/vscroll/makefile.unx index a2d4b03e0d..ddeeaf893b 100644 --- a/samples/vscroll/makefile.unx +++ b/samples/vscroll/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) vstest: $(VSTEST_OBJECTS) - $(CXX) -o $@ $(VSTEST_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(VSTEST_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) vstest_vstest.o: ./vstest.cpp $(CXX) -c -o $@ $(VSTEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/vscroll/makefile.vc b/samples/vscroll/makefile.vc index 0fb8c185d8..85c6adfd0d 100644 --- a/samples/vscroll/makefile.vc +++ b/samples/vscroll/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\vstest.pdb del $(OBJS)\vstest.pdb $(OBJS)\vstest.exe: $(VSTEST_OBJECTS) $(OBJS)\vstest_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\vstest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\vstest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(VSTEST_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/vscroll/makefile.wat b/samples/vscroll/makefile.wat index f5a683cf1e..ba077814ed 100644 --- a/samples/vscroll/makefile.wat +++ b/samples/vscroll/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\vstest.exe : $(VSTEST_OBJECTS) $(OBJS)\vstest_sample.res @%append $(OBJS)\vstest.lbc option quiet @%append $(OBJS)\vstest.lbc name $^@ @%append $(OBJS)\vstest.lbc option caseexact - @%append $(OBJS)\vstest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\vstest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(VSTEST_OBJECTS)) do @%append $(OBJS)\vstest.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\vstest.lbc library %i @%append $(OBJS)\vstest.lbc option resource=$(OBJS)\vstest_sample.res diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in index 002a4a0063..ec78426853 100644 --- a/samples/widgets/Makefile.in +++ b/samples/widgets/Makefile.in @@ -172,7 +172,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile widgets$(EXEEXT): $(WIDGETS_OBJECTS) $(__widgets___win32rc) - $(CXX) -o $@ $(WIDGETS_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) + $(CXX) -o $@ $(WIDGETS_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) $(__widgets___mac_setfilecmd) $(__widgets___os2_emxbindcmd) @@ -295,6 +295,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ $(srcdir)/include/wx/stc/stc.h # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean widgets_bundle diff --git a/samples/widgets/makefile.bcc b/samples/widgets/makefile.bcc index 94a5f41e18..6ac31ea1a8 100644 --- a/samples/widgets/makefile.bcc +++ b/samples/widgets/makefile.bcc @@ -259,7 +259,7 @@ clean: -if exist $(OBJS)\widgets.ils del $(OBJS)\widgets.ils $(OBJS)\widgets.exe: $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(WIDGETS_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\widgets_sample.res | diff --git a/samples/widgets/makefile.gcc b/samples/widgets/makefile.gcc index 39339f1eb2..87e7c8365a 100644 --- a/samples/widgets/makefile.gcc +++ b/samples/widgets/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -254,7 +254,7 @@ clean: -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe $(OBJS)\widgets.exe: $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample_rc.o - $(CXX) -o $@ $(WIDGETS_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(WIDGETS_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\widgets_bmpcombobox.o: ./bmpcombobox.cpp $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/widgets/makefile.unx b/samples/widgets/makefile.unx index 63358b9a77..82aa673265 100644 --- a/samples/widgets/makefile.unx +++ b/samples/widgets/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -124,7 +124,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) widgets: $(WIDGETS_OBJECTS) - $(CXX) -o $@ $(WIDGETS_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` + $(CXX) -o $@ $(WIDGETS_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` $(LDFLAGS) widgets_bmpcombobox.o: ./bmpcombobox.cpp $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/widgets/makefile.vc b/samples/widgets/makefile.vc index 02bce0484e..2cfa6d3990 100644 --- a/samples/widgets/makefile.vc +++ b/samples/widgets/makefile.vc @@ -335,7 +335,7 @@ clean: -if exist $(OBJS)\widgets.pdb del $(OBJS)\widgets.pdb $(OBJS)\widgets.exe: $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\widgets.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\widgets.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(WIDGETS_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/widgets/makefile.wat b/samples/widgets/makefile.wat index 402785d87c..c5a45cf4ea 100644 --- a/samples/widgets/makefile.wat +++ b/samples/widgets/makefile.wat @@ -282,7 +282,7 @@ $(OBJS)\widgets.exe : $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample.res @%append $(OBJS)\widgets.lbc option quiet @%append $(OBJS)\widgets.lbc name $^@ @%append $(OBJS)\widgets.lbc option caseexact - @%append $(OBJS)\widgets.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\widgets.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(WIDGETS_OBJECTS)) do @%append $(OBJS)\widgets.lbc file %i @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\widgets.lbc library %i @%append $(OBJS)\widgets.lbc option resource=$(OBJS)\widgets_sample.res diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in index de8c583143..a46bcdc331 100644 --- a/samples/wizard/Makefile.in +++ b/samples/wizard/Makefile.in @@ -146,7 +146,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc) - $(CXX) -o $@ $(WIZARD_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) + $(CXX) -o $@ $(WIZARD_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) $(__wizard___mac_setfilecmd) $(__wizard___os2_emxbindcmd) @@ -191,6 +191,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ $(srcdir)/include/wx/stc/stc.h # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean wizard_bundle diff --git a/samples/wizard/makefile.bcc b/samples/wizard/makefile.bcc index d21301bab2..0475d0e6bd 100644 --- a/samples/wizard/makefile.bcc +++ b/samples/wizard/makefile.bcc @@ -233,7 +233,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(WIZARD_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wizard_wizard.res | diff --git a/samples/wizard/makefile.gcc b/samples/wizard/makefile.gcc index 8921a994d7..186f3f109b 100644 --- a/samples/wizard/makefile.gcc +++ b/samples/wizard/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: -if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe $(OBJS)\wizard.exe: $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard_rc.o - $(CXX) -o $@ $(WIZARD_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(WIZARD_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\wizard_wizard.o: ./wizard.cpp $(CXX) -c -o $@ $(WIZARD_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/wizard/makefile.unx b/samples/wizard/makefile.unx index 1ad13700d9..89892a346d 100644 --- a/samples/wizard/makefile.unx +++ b/samples/wizard/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) wizard: $(WIZARD_OBJECTS) - $(CXX) -o $@ $(WIZARD_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` + $(CXX) -o $@ $(WIZARD_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` $(LDFLAGS) wizard_wizard.o: ./wizard.cpp $(CXX) -c -o $@ $(WIZARD_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/wizard/makefile.vc b/samples/wizard/makefile.vc index 4e03bd9bd8..7528877862 100644 --- a/samples/wizard/makefile.vc +++ b/samples/wizard/makefile.vc @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\wizard.pdb del $(OBJS)\wizard.pdb $(OBJS)\wizard.exe: $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\wizard.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wizard.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(WIZARD_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/wizard/makefile.wat b/samples/wizard/makefile.wat index 145ce1181d..a4d1aef5cd 100644 --- a/samples/wizard/makefile.wat +++ b/samples/wizard/makefile.wat @@ -256,7 +256,7 @@ $(OBJS)\wizard.exe : $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard.res @%append $(OBJS)\wizard.lbc option quiet @%append $(OBJS)\wizard.lbc name $^@ @%append $(OBJS)\wizard.lbc option caseexact - @%append $(OBJS)\wizard.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\wizard.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(WIZARD_OBJECTS)) do @%append $(OBJS)\wizard.lbc file %i @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\wizard.lbc library %i @%append $(OBJS)\wizard.lbc option resource=$(OBJS)\wizard_wizard.res diff --git a/samples/wrapsizer/Makefile.in b/samples/wrapsizer/Makefile.in index b2102159bc..162b2117ed 100644 --- a/samples/wrapsizer/Makefile.in +++ b/samples/wrapsizer/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -70,28 +69,20 @@ WRAPSIZER_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__wrapsizer___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__wrapsizer___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C wrapsizer$(EXEEXT) -@COND_PLATFORM_MAC_1@__wrapsizer___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL wrapsizer$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___wrapsizer___os2_emxbindcmd = $(NM) wrapsizer$(EXEEXT) | \ if grep -q pmwin.763 ; then emxbind -ep wrapsizer$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__wrapsizer___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___wrapsizer___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__wrapsizer___win32rc = wrapsizer_sample_rc.o @@ -129,12 +120,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - wrapsizer$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,8 +141,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile wrapsizer$(EXEEXT): $(WRAPSIZER_OBJECTS) $(__wrapsizer___win32rc) - $(CXX) -o $@ $(WRAPSIZER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__wrapsizer___mac_rezcmd) + $(CXX) -o $@ $(WRAPSIZER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__wrapsizer___mac_setfilecmd) $(__wrapsizer___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -191,7 +176,16 @@ wrapsizer_wrapsizer.o: $(srcdir)/wrapsizer.cpp $(CXXC) -c -o $@ $(WRAPSIZER_CXXFLAGS) $(srcdir)/wrapsizer.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean wrapsizer_bundle diff --git a/samples/wrapsizer/makefile.bcc b/samples/wrapsizer/makefile.bcc index 716870d325..a0fcd0a97b 100644 --- a/samples/wrapsizer/makefile.bcc +++ b/samples/wrapsizer/makefile.bcc @@ -229,7 +229,7 @@ clean: -if exist $(OBJS)\wrapsizer.ils del $(OBJS)\wrapsizer.ils $(OBJS)\wrapsizer.exe: $(WRAPSIZER_OBJECTS) $(OBJS)\wrapsizer_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(WRAPSIZER_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wrapsizer_sample.res | diff --git a/samples/wrapsizer/makefile.gcc b/samples/wrapsizer/makefile.gcc index f30395b839..f3ca6f505a 100644 --- a/samples/wrapsizer/makefile.gcc +++ b/samples/wrapsizer/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\wrapsizer.exe del $(OBJS)\wrapsizer.exe $(OBJS)\wrapsizer.exe: $(WRAPSIZER_OBJECTS) $(OBJS)\wrapsizer_sample_rc.o - $(CXX) -o $@ $(WRAPSIZER_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(WRAPSIZER_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\wrapsizer_sample_rc.o: ./../../samples/sample.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH diff --git a/samples/wrapsizer/makefile.unx b/samples/wrapsizer/makefile.unx index 56e0e7994e..a964687ebc 100644 --- a/samples/wrapsizer/makefile.unx +++ b/samples/wrapsizer/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) wrapsizer: $(WRAPSIZER_OBJECTS) - $(CXX) -o $@ $(WRAPSIZER_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` + $(CXX) -o $@ $(WRAPSIZER_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) wrapsizer_wrapsizer.o: ./wrapsizer.cpp $(CXX) -c -o $@ $(WRAPSIZER_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/wrapsizer/makefile.vc b/samples/wrapsizer/makefile.vc index 68c4d80fa8..065b3a7966 100644 --- a/samples/wrapsizer/makefile.vc +++ b/samples/wrapsizer/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\wrapsizer.pdb del $(OBJS)\wrapsizer.pdb $(OBJS)\wrapsizer.exe: $(WRAPSIZER_OBJECTS) $(OBJS)\wrapsizer_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\wrapsizer.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wrapsizer.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(WRAPSIZER_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/wrapsizer/makefile.wat b/samples/wrapsizer/makefile.wat index 0808168364..f3d41464bf 100644 --- a/samples/wrapsizer/makefile.wat +++ b/samples/wrapsizer/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\wrapsizer.exe : $(WRAPSIZER_OBJECTS) $(OBJS)\wrapsizer_sample.res @%append $(OBJS)\wrapsizer.lbc option quiet @%append $(OBJS)\wrapsizer.lbc name $^@ @%append $(OBJS)\wrapsizer.lbc option caseexact - @%append $(OBJS)\wrapsizer.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\wrapsizer.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(WRAPSIZER_OBJECTS)) do @%append $(OBJS)\wrapsizer.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\wrapsizer.lbc library %i @%append $(OBJS)\wrapsizer.lbc option resource=$(OBJS)\wrapsizer_sample.res diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in index f53e41b749..2477beb641 100644 --- a/samples/xrc/Makefile.in +++ b/samples/xrc/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -77,28 +76,20 @@ XRCDEMO_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__xrcdemo___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__xrcdemo___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C xrcdemo$(EXEEXT) -@COND_PLATFORM_MAC_1@__xrcdemo___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL xrcdemo$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___xrcdemo___os2_emxbindcmd = $(NM) xrcdemo$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep xrcdemo$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__xrcdemo___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___xrcdemo___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__xrcdemo_os2_lib_res = \ @@ -148,12 +139,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - xrcdemo$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -175,8 +160,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc) - $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__xrcdemo___mac_rezcmd) + $(CXX) -o $@ $(XRCDEMO_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__xrcdemo___mac_setfilecmd) $(__xrcdemo___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -231,7 +216,16 @@ xrcdemo_xrcdemo_rc.o: $(srcdir)/xrcdemo.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean xrcdemo_bundle data diff --git a/samples/xrc/makefile.bcc b/samples/xrc/makefile.bcc index 260fba2002..0b6729b1f4 100644 --- a/samples/xrc/makefile.bcc +++ b/samples/xrc/makefile.bcc @@ -248,7 +248,7 @@ clean: -if exist $(OBJS)\xrcdemo.ils del $(OBJS)\xrcdemo.ils $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| c0w32.obj $(XRCDEMO_OBJECTS),$@,, $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\xrcdemo_xrcdemo.res | diff --git a/samples/xrc/makefile.gcc b/samples/xrc/makefile.gcc index 187c9dfdd5..7aaf864618 100644 --- a/samples/xrc/makefile.gcc +++ b/samples/xrc/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -243,7 +243,7 @@ clean: -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo_rc.o - $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS)\rc mkdir $(OBJS)\rc diff --git a/samples/xrc/makefile.unx b/samples/xrc/makefile.unx index 1f53c58e5c..9d7f06742b 100644 --- a/samples/xrc/makefile.unx +++ b/samples/xrc/makefile.unx @@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\. ### Variables: ### -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD +CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ @@ -101,7 +101,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) xrcdemo: $(XRCDEMO_OBJECTS) - $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs xrc,html,adv,core,xml,base` + $(CXX) -o $@ $(XRCDEMO_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs xrc,html,adv,core,xml,base` $(LDFLAGS) xrcdemo_xrcdemo.o: ./xrcdemo.cpp $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/xrc/makefile.vc b/samples/xrc/makefile.vc index 98bd2571be..10a7094360 100644 --- a/samples/xrc/makefile.vc +++ b/samples/xrc/makefile.vc @@ -324,7 +324,7 @@ clean: -if exist $(OBJS)\xrcdemo.pdb del $(OBJS)\xrcdemo.pdb $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\xrcdemo.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\xrcdemo.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(XRCDEMO_OBJECTS) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/xrc/makefile.wat b/samples/xrc/makefile.wat index 086f51565a..8b9ccb22c7 100644 --- a/samples/xrc/makefile.wat +++ b/samples/xrc/makefile.wat @@ -274,7 +274,7 @@ $(OBJS)\xrcdemo.exe : $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res @%append $(OBJS)\xrcdemo.lbc option quiet @%append $(OBJS)\xrcdemo.lbc name $^@ @%append $(OBJS)\xrcdemo.lbc option caseexact - @%append $(OBJS)\xrcdemo.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\xrcdemo.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(XRCDEMO_OBJECTS)) do @%append $(OBJS)\xrcdemo.lbc file %i @for %i in ( $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\xrcdemo.lbc library %i @%append $(OBJS)\xrcdemo.lbc option resource=$(OBJS)\xrcdemo_xrcdemo.res diff --git a/tests/benchmarks/Makefile.in b/tests/benchmarks/Makefile.in index 321eee4790..3d72d817f8 100644 --- a/tests/benchmarks/Makefile.in +++ b/tests/benchmarks/Makefile.in @@ -103,7 +103,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile bench$(EXEEXT): $(BENCH_OBJECTS) - $(CXX) -o $@ $(BENCH_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) + $(CXX) -o $@ $(BENCH_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) $(__bench___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) @@ -146,6 +146,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ $(srcdir)/include/wx/stc/stc.h # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean data diff --git a/tests/benchmarks/bench.dsp b/tests/benchmarks/bench.dsp index 093e8742f1..512864bfe8 100644 --- a/tests/benchmarks/bench.dsp +++ b/tests/benchmarks/bench.dsp @@ -38,185 +38,185 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc6_mswunivudll" -# PROP BASE Intermediate_Dir "vc6_mswunivudll\bench" +# PROP BASE Output_Dir "vc_mswunivudll" +# PROP BASE Intermediate_Dir "vc_mswunivudll\bench" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc6_mswunivudll" -# PROP Intermediate_Dir "vc6_mswunivudll\bench" +# PROP Output_Dir "vc_mswunivudll" +# PROP Intermediate_Dir "vc_mswunivudll\bench" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc6_mswunivudll\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc6_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc6_mswunivudll\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc6_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc6_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc6_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc6_mswunivudll\bench.exe" /debug /pdb:"vc6_mswunivudll\bench.pdb" /libpath:".\..\..\lib\vc6_dll" /subsystem:console -# ADD LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc6_mswunivudll\bench.exe" /debug /pdb:"vc6_mswunivudll\bench.pdb" /libpath:".\..\..\lib\vc6_dll" /subsystem:console +# ADD BASE LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivudll\bench.exe" /debug /pdb:"vc_mswunivudll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console +# ADD LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivudll\bench.exe" /debug /pdb:"vc_mswunivudll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console !ELSEIF "$(CFG)" == "bench - Win32 DLL Universal Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc6_mswunivuddll" -# PROP BASE Intermediate_Dir "vc6_mswunivuddll\bench" +# PROP BASE Output_Dir "vc_mswunivuddll" +# PROP BASE Intermediate_Dir "vc_mswunivuddll\bench" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc6_mswunivuddll" -# PROP Intermediate_Dir "vc6_mswunivuddll\bench" +# PROP Output_Dir "vc_mswunivuddll" +# PROP Intermediate_Dir "vc_mswunivuddll\bench" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc6_mswunivuddll\bench.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc6_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MDd /Zi /Fdvc6_mswunivuddll\bench.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc6_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc6_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc6_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 +# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\bench.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\bench.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc6_mswunivuddll\bench.exe" /debug /pdb:"vc6_mswunivuddll\bench.pdb" /libpath:".\..\..\lib\vc6_dll" /subsystem:console -# ADD LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc6_mswunivuddll\bench.exe" /debug /pdb:"vc6_mswunivuddll\bench.pdb" /libpath:".\..\..\lib\vc6_dll" /subsystem:console +# ADD BASE LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\bench.exe" /debug /pdb:"vc_mswunivuddll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console +# ADD LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\bench.exe" /debug /pdb:"vc_mswunivuddll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console !ELSEIF "$(CFG)" == "bench - Win32 DLL Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc6_mswudll" -# PROP BASE Intermediate_Dir "vc6_mswudll\bench" +# PROP BASE Output_Dir "vc_mswudll" +# PROP BASE Intermediate_Dir "vc_mswudll\bench" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc6_mswudll" -# PROP Intermediate_Dir "vc6_mswudll\bench" +# PROP Output_Dir "vc_mswudll" +# PROP Intermediate_Dir "vc_mswudll\bench" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc6_mswudll\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc6_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc6_mswudll\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc6_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc6_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 -# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc6_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 +# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc6_mswudll\bench.exe" /debug /pdb:"vc6_mswudll\bench.pdb" /libpath:".\..\..\lib\vc6_dll" /subsystem:console -# ADD LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc6_mswudll\bench.exe" /debug /pdb:"vc6_mswudll\bench.pdb" /libpath:".\..\..\lib\vc6_dll" /subsystem:console +# ADD BASE LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswudll\bench.exe" /debug /pdb:"vc_mswudll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console +# ADD LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswudll\bench.exe" /debug /pdb:"vc_mswudll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console !ELSEIF "$(CFG)" == "bench - Win32 DLL Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc6_mswuddll" -# PROP BASE Intermediate_Dir "vc6_mswuddll\bench" +# PROP BASE Output_Dir "vc_mswuddll" +# PROP BASE Intermediate_Dir "vc_mswuddll\bench" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc6_mswuddll" -# PROP Intermediate_Dir "vc6_mswuddll\bench" +# PROP Output_Dir "vc_mswuddll" +# PROP Intermediate_Dir "vc_mswuddll\bench" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc6_mswuddll\bench.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc6_dll\mswud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MDd /Zi /Fdvc6_mswuddll\bench.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc6_dll\mswud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc6_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc6_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 +# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\bench.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\bench.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc6_mswuddll\bench.exe" /debug /pdb:"vc6_mswuddll\bench.pdb" /libpath:".\..\..\lib\vc6_dll" /subsystem:console -# ADD LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc6_mswuddll\bench.exe" /debug /pdb:"vc6_mswuddll\bench.pdb" /libpath:".\..\..\lib\vc6_dll" /subsystem:console +# ADD BASE LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswuddll\bench.exe" /debug /pdb:"vc_mswuddll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console +# ADD LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswuddll\bench.exe" /debug /pdb:"vc_mswuddll\bench.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:console !ELSEIF "$(CFG)" == "bench - Win32 Universal Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc6_mswunivu" -# PROP BASE Intermediate_Dir "vc6_mswunivu\bench" +# PROP BASE Output_Dir "vc_mswunivu" +# PROP BASE Intermediate_Dir "vc_mswunivu\bench" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc6_mswunivu" -# PROP Intermediate_Dir "vc6_mswunivu\bench" +# PROP Output_Dir "vc_mswunivu" +# PROP Intermediate_Dir "vc_mswunivu\bench" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc6_mswunivu\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc6_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc6_mswunivu\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc6_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc6_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc6_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc6_mswunivu\bench.exe" /debug /pdb:"vc6_mswunivu\bench.pdb" /libpath:".\..\..\lib\vc6_lib" /subsystem:console -# ADD LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc6_mswunivu\bench.exe" /debug /pdb:"vc6_mswunivu\bench.pdb" /libpath:".\..\..\lib\vc6_lib" /subsystem:console +# ADD BASE LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivu\bench.exe" /debug /pdb:"vc_mswunivu\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console +# ADD LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivu\bench.exe" /debug /pdb:"vc_mswunivu\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console !ELSEIF "$(CFG)" == "bench - Win32 Universal Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc6_mswunivud" -# PROP BASE Intermediate_Dir "vc6_mswunivud\bench" +# PROP BASE Output_Dir "vc_mswunivud" +# PROP BASE Intermediate_Dir "vc_mswunivud\bench" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc6_mswunivud" -# PROP Intermediate_Dir "vc6_mswunivud\bench" +# PROP Output_Dir "vc_mswunivud" +# PROP Intermediate_Dir "vc_mswunivud\bench" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc6_mswunivud\bench.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc6_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MDd /Zi /Fdvc6_mswunivud\bench.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc6_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc6_lib\mswunivud" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc6_lib\mswunivud" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 +# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\bench.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\bench.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc6_mswunivud\bench.exe" /debug /pdb:"vc6_mswunivud\bench.pdb" /libpath:".\..\..\lib\vc6_lib" /subsystem:console -# ADD LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc6_mswunivud\bench.exe" /debug /pdb:"vc6_mswunivud\bench.pdb" /libpath:".\..\..\lib\vc6_lib" /subsystem:console +# ADD BASE LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivud\bench.exe" /debug /pdb:"vc_mswunivud\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console +# ADD LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivud\bench.exe" /debug /pdb:"vc_mswunivud\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console !ELSEIF "$(CFG)" == "bench - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc6_mswu" -# PROP BASE Intermediate_Dir "vc6_mswu\bench" +# PROP BASE Output_Dir "vc_mswu" +# PROP BASE Intermediate_Dir "vc_mswu\bench" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc6_mswu" -# PROP Intermediate_Dir "vc6_mswu\bench" +# PROP Output_Dir "vc_mswu" +# PROP Intermediate_Dir "vc_mswu\bench" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc6_mswu\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc6_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc6_mswu\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc6_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc6_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 -# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc6_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\bench.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 +# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc6_mswu\bench.exe" /debug /pdb:"vc6_mswu\bench.pdb" /libpath:".\..\..\lib\vc6_lib" /subsystem:console -# ADD LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc6_mswu\bench.exe" /debug /pdb:"vc6_mswu\bench.pdb" /libpath:".\..\..\lib\vc6_lib" /subsystem:console +# ADD BASE LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswu\bench.exe" /debug /pdb:"vc_mswu\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console +# ADD LINK32 wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswu\bench.exe" /debug /pdb:"vc_mswu\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console !ELSEIF "$(CFG)" == "bench - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc6_mswud" -# PROP BASE Intermediate_Dir "vc6_mswud\bench" +# PROP BASE Output_Dir "vc_mswud" +# PROP BASE Intermediate_Dir "vc_mswud\bench" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc6_mswud" -# PROP Intermediate_Dir "vc6_mswud\bench" +# PROP Output_Dir "vc_mswud" +# PROP Intermediate_Dir "vc_mswud\bench" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc6_mswud\bench.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc6_lib\mswud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MDd /Zi /Fdvc6_mswud\bench.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc6_lib\mswud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc6_lib\mswud" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc6_lib\mswud" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 +# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswud\bench.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswud\bench.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc6_mswud\bench.exe" /debug /pdb:"vc6_mswud\bench.pdb" /libpath:".\..\..\lib\vc6_lib" /subsystem:console -# ADD LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc6_mswud\bench.exe" /debug /pdb:"vc6_mswud\bench.pdb" /libpath:".\..\..\lib\vc6_lib" /subsystem:console +# ADD BASE LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswud\bench.exe" /debug /pdb:"vc_mswud\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console +# ADD LINK32 wxbase29ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswud\bench.exe" /debug /pdb:"vc_mswud\bench.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:console !ENDIF diff --git a/tests/benchmarks/bench.sln b/tests/benchmarks/bench.sln index c5927f813b..62b0c27ffc 100644 --- a/tests/benchmarks/bench.sln +++ b/tests/benchmarks/bench.sln @@ -1,4 +1,5 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench", "bench.vcproj", "{205F8D16-BA71-560B-A3DF-7A2A93B16CF6}" EndProject Global diff --git a/tests/benchmarks/bench.vcproj b/tests/benchmarks/bench.vcproj index 87ae5dab7e..943cc29ad0 100644 --- a/tests/benchmarks/bench.vcproj +++ b/tests/benchmarks/bench.vcproj @@ -8,37 +8,48 @@ --> + ProjectGUID="{205F8D16-BA71-560B-A3DF-7A2A93B16CF6}" + > + Name="Win32" + /> + + + + CharacterSet="1" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCIDLTool" + /> + SuppressStartupBanner="true" + /> + Name="VCManagedResourceCompilerTool" + /> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;." + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + /> + Name="VCPreLinkEventTool" + /> + ProgramDatabaseFile="vc_mswunivudll\bench.pdb" + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + OutputFile="vc_mswunivudll\bench.bsc" + SuppressStartupBanner="true" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="1" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCIDLTool" + /> + SuppressStartupBanner="true" + /> + Name="VCManagedResourceCompilerTool" + /> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;." + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + /> + Name="VCPreLinkEventTool" + /> + ProgramDatabaseFile="vc_mswunivuddll\bench.pdb" + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + OutputFile="vc_mswunivuddll\bench.bsc" + SuppressStartupBanner="true" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="1" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCIDLTool" + /> + SuppressStartupBanner="true" + /> + Name="VCManagedResourceCompilerTool" + /> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;." + PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + /> + Name="VCPreLinkEventTool" + /> + ProgramDatabaseFile="vc_mswudll\bench.pdb" + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + OutputFile="vc_mswudll\bench.bsc" + SuppressStartupBanner="true" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="1" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCIDLTool" + /> + SuppressStartupBanner="true" + /> + Name="VCManagedResourceCompilerTool" + /> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;." + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + /> + Name="VCPreLinkEventTool" + /> + ProgramDatabaseFile="vc_mswuddll\bench.pdb" + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + OutputFile="vc_mswuddll\bench.bsc" + SuppressStartupBanner="true" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="1" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCIDLTool" + /> + SuppressStartupBanner="true" + /> + Name="VCManagedResourceCompilerTool" + /> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;." + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + /> + Name="VCPreLinkEventTool" + /> + ProgramDatabaseFile="vc_mswunivu\bench.pdb" + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + OutputFile="vc_mswunivu\bench.bsc" + SuppressStartupBanner="true" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="1" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCIDLTool" + /> + SuppressStartupBanner="true" + /> + Name="VCManagedResourceCompilerTool" + /> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;." + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + /> + Name="VCPreLinkEventTool" + /> + ProgramDatabaseFile="vc_mswunivud\bench.pdb" + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + OutputFile="vc_mswunivud\bench.bsc" + SuppressStartupBanner="true" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="1" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCIDLTool" + /> + SuppressStartupBanner="true" + /> + Name="VCManagedResourceCompilerTool" + /> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;." + PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + /> + Name="VCPreLinkEventTool" + /> + ProgramDatabaseFile="vc_mswu\bench.pdb" + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + OutputFile="vc_mswu\bench.bsc" + SuppressStartupBanner="true" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="1" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCIDLTool" + /> + SuppressStartupBanner="true" + /> + Name="VCManagedResourceCompilerTool" + /> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;." + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + /> + Name="VCPreLinkEventTool" + /> + ProgramDatabaseFile="vc_mswud\bench.pdb" + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + OutputFile="vc_mswud\bench.bsc" + SuppressStartupBanner="true" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + /> @@ -624,17 +781,23 @@ + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + > + RelativePath=".\bench.cpp" + /> + RelativePath=".\htmlparser\htmlpars.cpp" + /> + RelativePath=".\htmlparser\htmltag.cpp" + /> + RelativePath=".\strings.cpp" + /> + RelativePath=".\tls.cpp" + /> diff --git a/tests/benchmarks/makefile.bcc b/tests/benchmarks/makefile.bcc index 10c4adee99..7b06612af4 100644 --- a/tests/benchmarks/makefile.bcc +++ b/tests/benchmarks/makefile.bcc @@ -187,7 +187,7 @@ clean: -if exist $(OBJS)\bench.ils del $(OBJS)\bench.ils $(OBJS)\bench.exe: $(BENCH_OBJECTS) - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&| c0x32.obj $(BENCH_OBJECTS),$@,, $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, | diff --git a/tests/benchmarks/makefile.gcc b/tests/benchmarks/makefile.gcc index f576e83e6c..76badad3ca 100644 --- a/tests/benchmarks/makefile.gcc +++ b/tests/benchmarks/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -179,7 +179,7 @@ clean: -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe $(OBJS)\bench.exe: $(BENCH_OBJECTS) - $(CXX) -o $@ $(BENCH_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(BENCH_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/tests/benchmarks/makefile.vc b/tests/benchmarks/makefile.vc index 90e4d8832f..90677d1df0 100644 --- a/tests/benchmarks/makefile.vc +++ b/tests/benchmarks/makefile.vc @@ -244,7 +244,7 @@ clean: -if exist $(OBJS)\bench.pdb del $(OBJS)\bench.pdb $(OBJS)\bench.exe: $(BENCH_OBJECTS) - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\bench.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\bench.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< $(BENCH_OBJECTS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/tests/benchmarks/makefile.wat b/tests/benchmarks/makefile.wat index 3da8f9422c..27dd007437 100644 --- a/tests/benchmarks/makefile.wat +++ b/tests/benchmarks/makefile.wat @@ -237,7 +237,7 @@ $(OBJS)\bench.exe : $(BENCH_OBJECTS) @%append $(OBJS)\bench.lbc option quiet @%append $(OBJS)\bench.lbc name $^@ @%append $(OBJS)\bench.lbc option caseexact - @%append $(OBJS)\bench.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' + @%append $(OBJS)\bench.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) @for %i in ($(BENCH_OBJECTS)) do @%append $(OBJS)\bench.lbc file %i @for %i in ( $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\bench.lbc library %i @%append $(OBJS)\bench.lbc diff --git a/tests/makefile.bcc b/tests/makefile.bcc index 5161340ad7..8502a506c7 100644 --- a/tests/makefile.bcc +++ b/tests/makefile.bcc @@ -339,13 +339,13 @@ clean: -if exist $(OBJS)\printfbench.ils del $(OBJS)\printfbench.ils $(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS) - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) $(LDFLAGS) @&&| c0x32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,, | !if "$(USE_GUI)" == "1" $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) -ap @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) -ap $(LDFLAGS) @&&| c0x32.obj $(TEST_GUI_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,, $(OBJS)\test_gui_sample.res | !endif @@ -359,7 +359,7 @@ fr: for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr $(OBJS)\printfbench.exe: $(OBJS)\printfbench_dummy.obj $(PRINTFBENCH_OBJECTS) - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) $(LDFLAGS) @&&| c0x32.obj $(PRINTFBENCH_OBJECTS),$@,, $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,, | diff --git a/tests/makefile.gcc b/tests/makefile.gcc index 8c44c497e0..c109799072 100644 --- a/tests/makefile.gcc +++ b/tests/makefile.gcc @@ -12,7 +12,7 @@ include ../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -323,11 +323,11 @@ clean: -if exist $(OBJS)\printfbench.exe del $(OBJS)\printfbench.exe $(OBJS)\test.exe: $(TEST_OBJECTS) - $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(TEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 ifeq ($(USE_GUI),1) $(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample_rc.o - $(CXX) -o $@ $(TEST_GUI_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(TEST_GUI_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 endif data: @@ -339,7 +339,7 @@ fr: for %%f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%%f copy .\intl\fr\%%f $(OBJS)\intl\fr $(OBJS)\printfbench.exe: $(PRINTFBENCH_OBJECTS) - $(CXX) -o $@ $(PRINTFBENCH_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(PRINTFBENCH_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(LDFLAGS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\test_dummy.o: ./dummy.cpp $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/tests/makefile.vc b/tests/makefile.vc index 531a13c6eb..8f4f462730 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -424,13 +424,13 @@ clean: -if exist $(OBJS)\printfbench.pdb del $(OBJS)\printfbench.pdb $(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS) - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) /pdb:"$(OBJS)\test.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_2) /pdb:"$(OBJS)\test.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) $(LDFLAGS) @<< $(TEST_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << !if "$(USE_GUI)" == "1" $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) /pdb:"$(OBJS)\test_gui.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(CPPUNIT_LIBS) /SUBSYSTEM:CONSOLE @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_2) /pdb:"$(OBJS)\test_gui.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(CPPUNIT_LIBS) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< $(TEST_GUI_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << !endif @@ -444,7 +444,7 @@ fr: for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr $(OBJS)\printfbench.exe: $(OBJS)\printfbench_dummy.obj $(PRINTFBENCH_OBJECTS) - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) /pdb:"$(OBJS)\printfbench.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_2) /pdb:"$(OBJS)\printfbench.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) $(LDFLAGS) @<< $(PRINTFBENCH_OBJECTS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/tests/makefile.wat b/tests/makefile.wat index d786cde266..03a2a48841 100644 --- a/tests/makefile.wat +++ b/tests/makefile.wat @@ -353,7 +353,7 @@ $(OBJS)\test.exe : $(TEST_OBJECTS) @%append $(OBJS)\test.lbc option quiet @%append $(OBJS)\test.lbc name $^@ @%append $(OBJS)\test.lbc option caseexact - @%append $(OBJS)\test.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME) system nt ref 'main_' $(CPPUNIT_LIBS) + @%append $(OBJS)\test.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) system nt ref 'main_' $(CPPUNIT_LIBS) $(LDFLAGS) @for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\test.lbc library %i @%append $(OBJS)\test.lbc @@ -366,7 +366,7 @@ $(OBJS)\test_gui.exe : $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res @%append $(OBJS)\test_gui.lbc option quiet @%append $(OBJS)\test_gui.lbc name $^@ @%append $(OBJS)\test_gui.lbc option caseexact - @%append $(OBJS)\test_gui.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(CPPUNIT_LIBS) system nt ref 'main_' + @%append $(OBJS)\test_gui.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) $(CPPUNIT_LIBS) system nt ref 'main_' $(LDFLAGS) @for %i in ($(TEST_GUI_OBJECTS)) do @%append $(OBJS)\test_gui.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\test_gui.lbc library %i @%append $(OBJS)\test_gui.lbc option resource=$(OBJS)\test_gui_sample.res @@ -387,7 +387,7 @@ $(OBJS)\printfbench.exe : $(PRINTFBENCH_OBJECTS) @%append $(OBJS)\printfbench.lbc option quiet @%append $(OBJS)\printfbench.lbc name $^@ @%append $(OBJS)\printfbench.lbc option caseexact - @%append $(OBJS)\printfbench.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME) system nt ref 'main_' $(CPPUNIT_LIBS) + @%append $(OBJS)\printfbench.lbc $(__DEBUGINFO_2) libpath $(LIBDIRNAME) system nt ref 'main_' $(CPPUNIT_LIBS) $(LDFLAGS) @for %i in ($(PRINTFBENCH_OBJECTS)) do @%append $(OBJS)\printfbench.lbc file %i @for %i in ( $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\printfbench.lbc library %i @%append $(OBJS)\printfbench.lbc diff --git a/utils/Makefile.in b/utils/Makefile.in index 9b6ad411ab..ee9bc5409b 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in @@ -62,6 +62,7 @@ install-strip_ifacecheck: # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d -.PHONY: all install uninstall clean distclean emulator helpview ifacecheck install_ifacecheck uninstall_ifacecheck install-strip_ifacecheck +.PHONY: all install uninstall clean distclean emulator helpview ifacecheck \ + install_ifacecheck uninstall_ifacecheck install-strip_ifacecheck diff --git a/utils/emulator/src/Makefile.in b/utils/emulator/src/Makefile.in index f97aa45bf9..40ffcbd320 100644 --- a/utils/emulator/src/Makefile.in +++ b/utils/emulator/src/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -67,28 +66,20 @@ WXEMULATOR_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__wxemulator___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__wxemulator___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C wxemulator$(EXEEXT) -@COND_PLATFORM_MAC_1@__wxemulator___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL wxemulator$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___wxemulator___os2_emxbindcmd = $(NM) wxemulator$(EXEEXT) \ | if grep -q pmwin.763 ; then emxbind -ep wxemulator$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__wxemulator___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___wxemulator___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__wxemulator___win32rc = wxemulator_sample_rc.o @@ -119,12 +110,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - wxemulator$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -145,8 +130,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile wxemulator$(EXEEXT): $(WXEMULATOR_OBJECTS) $(__wxemulator___win32rc) - $(CXX) -o $@ $(WXEMULATOR_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__wxemulator___mac_rezcmd) + $(CXX) -o $@ $(WXEMULATOR_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__wxemulator___mac_setfilecmd) $(__wxemulator___os2_emxbindcmd) @@ -169,7 +154,16 @@ wxemulator_emulator.o: $(srcdir)/emulator.cpp $(CXXC) -c -o $@ $(WXEMULATOR_CXXFLAGS) $(srcdir)/emulator.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean data diff --git a/utils/emulator/src/makefile.bcc b/utils/emulator/src/makefile.bcc index 3800a32360..442dc69d32 100644 --- a/utils/emulator/src/makefile.bcc +++ b/utils/emulator/src/makefile.bcc @@ -229,7 +229,7 @@ clean: -if exist $(OBJS)\wxemulator.ils del $(OBJS)\wxemulator.ils $(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wxemulator_sample.res | diff --git a/utils/emulator/src/makefile.gcc b/utils/emulator/src/makefile.gcc index f2cfeb308c..b0c0f07829 100644 --- a/utils/emulator/src/makefile.gcc +++ b/utils/emulator/src/makefile.gcc @@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -224,7 +224,7 @@ clean: -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe $(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample_rc.o - $(CXX) -o $@ $(WXEMULATOR_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(WXEMULATOR_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/utils/emulator/src/makefile.vc b/utils/emulator/src/makefile.vc index 8a8084329b..eda8da10a6 100644 --- a/utils/emulator/src/makefile.vc +++ b/utils/emulator/src/makefile.vc @@ -305,7 +305,7 @@ clean: -if exist $(OBJS)\wxemulator.pdb del $(OBJS)\wxemulator.pdb $(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxemulator.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxemulator.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(WXEMULATOR_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/utils/emulator/src/makefile.wat b/utils/emulator/src/makefile.wat index 5ca3799d6f..aa09871a7b 100644 --- a/utils/emulator/src/makefile.wat +++ b/utils/emulator/src/makefile.wat @@ -251,7 +251,7 @@ $(OBJS)\wxemulator.exe : $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res @%append $(OBJS)\wxemulator.lbc option quiet @%append $(OBJS)\wxemulator.lbc name $^@ @%append $(OBJS)\wxemulator.lbc option caseexact - @%append $(OBJS)\wxemulator.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\wxemulator.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(WXEMULATOR_OBJECTS)) do @%append $(OBJS)\wxemulator.lbc file %i @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\wxemulator.lbc library %i @%append $(OBJS)\wxemulator.lbc option resource=$(OBJS)\wxemulator_sample.res diff --git a/utils/helpview/src/Makefile.in b/utils/helpview/src/Makefile.in index 9dec656f42..6d8f3349de 100644 --- a/utils/helpview/src/Makefile.in +++ b/utils/helpview/src/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ STRIP = @STRIP@ NM = @NM@ @@ -75,28 +74,20 @@ HELPVIEW_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__helpview___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__helpview___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C helpview$(EXEEXT) -@COND_PLATFORM_MAC_1@__helpview___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL helpview$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___helpview___os2_emxbindcmd = $(NM) helpview$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep helpview$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__helpview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___helpview___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__helpview_os2_lib_res = \ @@ -140,12 +131,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - helpview$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -168,8 +153,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc) - $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__helpview___mac_rezcmd) + $(CXX) -o $@ $(HELPVIEW_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__helpview___mac_setfilecmd) $(__helpview___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) @@ -222,7 +207,17 @@ helpview_helpview_rc.o: $(srcdir)/helpview.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d -.PHONY: all install uninstall clean distclean helpview_bundle install_helpview uninstall_helpview data +.PHONY: all install uninstall clean distclean helpview_bundle install_helpview \ + uninstall_helpview data diff --git a/utils/helpview/src/makefile.bcc b/utils/helpview/src/makefile.bcc index 4daf8bb5bd..9d1eb2a80a 100644 --- a/utils/helpview/src/makefile.bcc +++ b/utils/helpview/src/makefile.bcc @@ -237,7 +237,7 @@ clean: -if exist $(OBJS)\helpview.ils del $(OBJS)\helpview.ils $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\helpview_helpview.res | diff --git a/utils/helpview/src/makefile.gcc b/utils/helpview/src/makefile.gcc index 568207ab3c..2ac3c10362 100644 --- a/utils/helpview/src/makefile.gcc +++ b/utils/helpview/src/makefile.gcc @@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -232,7 +232,7 @@ clean: -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview_rc.o - $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) diff --git a/utils/helpview/src/makefile.vc b/utils/helpview/src/makefile.vc index 41af78fc56..78dfc8a739 100644 --- a/utils/helpview/src/makefile.vc +++ b/utils/helpview/src/makefile.vc @@ -313,7 +313,7 @@ clean: -if exist $(OBJS)\helpview.pdb del $(OBJS)\helpview.pdb $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/utils/helpview/src/makefile.wat b/utils/helpview/src/makefile.wat index 94ad241260..413ab843c8 100644 --- a/utils/helpview/src/makefile.wat +++ b/utils/helpview/src/makefile.wat @@ -261,7 +261,7 @@ $(OBJS)\helpview.exe : $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res @%append $(OBJS)\helpview.lbc option quiet @%append $(OBJS)\helpview.lbc name $^@ @%append $(OBJS)\helpview.lbc option caseexact - @%append $(OBJS)\helpview.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\helpview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(HELPVIEW_OBJECTS)) do @%append $(OBJS)\helpview.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\helpview.lbc library %i @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_helpview.res diff --git a/utils/hhp2cached/Makefile.in b/utils/hhp2cached/Makefile.in index 93fd22dfa4..e61a5c107d 100644 --- a/utils/hhp2cached/Makefile.in +++ b/utils/hhp2cached/Makefile.in @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -REZ = @REZ@ SETFILE = @SETFILE@ STRIP = @STRIP@ NM = @NM@ @@ -72,28 +71,20 @@ HHP2CACHED_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__hhp2cached___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__hhp2cached___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C hhp2cached$(EXEEXT) -@COND_PLATFORM_MAC_1@__hhp2cached___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL hhp2cached$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL COND_PLATFORM_OS2_1___hhp2cached___os2_emxbindcmd = $(NM) hhp2cached$(EXEEXT) \ | if grep -q pmwin.763 ; then emxbind -ep hhp2cached$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__hhp2cached___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___hhp2cached___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__hhp2cached_os2_lib_res = \ @@ -127,12 +118,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ - $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ - hhp2cached$(EXEEXT) Carbon.r sample.r -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -154,8 +139,8 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile hhp2cached$(EXEEXT): $(HHP2CACHED_OBJECTS) $(__hhp2cached___win32rc) - $(CXX) -o $@ $(HHP2CACHED_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - $(__hhp2cached___mac_rezcmd) + $(CXX) -o $@ $(HHP2CACHED_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(__hhp2cached___mac_setfilecmd) $(__hhp2cached___os2_emxbindcmd) @@ -173,7 +158,17 @@ hhp2cached_hhp2cached_rc.o: $(srcdir)/hhp2cached.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d -.PHONY: all install uninstall clean distclean install_hhp2cached uninstall_hhp2cached +.PHONY: all install uninstall clean distclean install_hhp2cached \ + uninstall_hhp2cached diff --git a/utils/hhp2cached/makefile.bcc b/utils/hhp2cached/makefile.bcc index 7e7002eb44..920807dc75 100644 --- a/utils/hhp2cached/makefile.bcc +++ b/utils/hhp2cached/makefile.bcc @@ -233,7 +233,7 @@ 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 -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| 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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\hhp2cached_hhp2cached.res | diff --git a/utils/hhp2cached/makefile.gcc b/utils/hhp2cached/makefile.gcc index 21e25b74aa..d745005548 100644 --- a/utils/hhp2cached/makefile.gcc +++ b/utils/hhp2cached/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -228,7 +228,7 @@ clean: -if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe $(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached_rc.o - $(CXX) -o $@ $(HHP2CACHED_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(HHP2CACHED_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\hhp2cached_hhp2cached.o: ./hhp2cached.cpp $(CXX) -c -o $@ $(HHP2CACHED_CXXFLAGS) $(CPPDEPS) $< diff --git a/utils/hhp2cached/makefile.vc b/utils/hhp2cached/makefile.vc index f753e8dfc5..96e33ba6d4 100644 --- a/utils/hhp2cached/makefile.vc +++ b/utils/hhp2cached/makefile.vc @@ -309,7 +309,7 @@ clean: -if exist $(OBJS)\hhp2cached.pdb del $(OBJS)\hhp2cached.pdb $(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\hhp2cached.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\hhp2cached.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< $(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$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/utils/hhp2cached/makefile.wat b/utils/hhp2cached/makefile.wat index abb040068b..61e71ab194 100644 --- a/utils/hhp2cached/makefile.wat +++ b/utils/hhp2cached/makefile.wat @@ -256,7 +256,7 @@ $(OBJS)\hhp2cached.exe : $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached.re @%append $(OBJS)\hhp2cached.lbc option quiet @%append $(OBJS)\hhp2cached.lbc name $^@ @%append $(OBJS)\hhp2cached.lbc option caseexact - @%append $(OBJS)\hhp2cached.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @%append $(OBJS)\hhp2cached.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) @for %i in ($(HHP2CACHED_OBJECTS)) do @%append $(OBJS)\hhp2cached.lbc file %i @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\hhp2cached.lbc library %i @%append $(OBJS)\hhp2cached.lbc option resource=$(OBJS)\hhp2cached_hhp2cached.res diff --git a/utils/ifacecheck/src/Makefile.in b/utils/ifacecheck/src/Makefile.in index 0344f382df..351df8ec5c 100644 --- a/utils/ifacecheck/src/Makefile.in +++ b/utils/ifacecheck/src/Makefile.in @@ -107,7 +107,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ifacecheck$(EXEEXT): $(IFACECHECK_OBJECTS) - $(CXX) -o $@ $(IFACECHECK_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) + $(CXX) -o $@ $(IFACECHECK_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) $(__ifacecheck___mac_setfilecmd) @@ -125,7 +125,17 @@ ifacecheck_xmlparser.o: $(srcdir)/xmlparser.cpp $(CXXC) -c -o $@ $(IFACECHECK_CXXFLAGS) $(srcdir)/xmlparser.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d -.PHONY: all install uninstall clean distclean install_ifacecheck uninstall_ifacecheck +.PHONY: all install uninstall clean distclean install_ifacecheck \ + uninstall_ifacecheck diff --git a/utils/ifacecheck/src/makefile.bcc b/utils/ifacecheck/src/makefile.bcc index 5bd01243eb..10a1417f5c 100644 --- a/utils/ifacecheck/src/makefile.bcc +++ b/utils/ifacecheck/src/makefile.bcc @@ -188,7 +188,7 @@ clean: -if exist $(OBJS)\ifacecheck.ils del $(OBJS)\ifacecheck.ils $(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS) - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&| c0x32.obj $(IFACECHECK_OBJECTS),$@,, $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, | diff --git a/utils/ifacecheck/src/makefile.gcc b/utils/ifacecheck/src/makefile.gcc index 6fb619ac8c..bc6bfb86f8 100644 --- a/utils/ifacecheck/src/makefile.gcc +++ b/utils/ifacecheck/src/makefile.gcc @@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -180,7 +180,7 @@ clean: -if exist $(OBJS)\ifacecheck.exe del $(OBJS)\ifacecheck.exe $(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS) - $(CXX) -o $@ $(IFACECHECK_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(IFACECHECK_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(OBJS)\ifacecheck_ifacecheck.o: ./ifacecheck.cpp $(CXX) -c -o $@ $(IFACECHECK_CXXFLAGS) $(CPPDEPS) $< diff --git a/utils/ifacecheck/src/makefile.vc b/utils/ifacecheck/src/makefile.vc index d56b6ce507..7f596f8319 100644 --- a/utils/ifacecheck/src/makefile.vc +++ b/utils/ifacecheck/src/makefile.vc @@ -245,7 +245,7 @@ clean: -if exist $(OBJS)\ifacecheck.pdb del $(OBJS)\ifacecheck.pdb $(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS) - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\ifacecheck.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\ifacecheck.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< $(IFACECHECK_OBJECTS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/utils/ifacecheck/src/makefile.wat b/utils/ifacecheck/src/makefile.wat index 3f5280c552..d5717f7094 100644 --- a/utils/ifacecheck/src/makefile.wat +++ b/utils/ifacecheck/src/makefile.wat @@ -240,7 +240,7 @@ $(OBJS)\ifacecheck.exe : $(IFACECHECK_OBJECTS) @%append $(OBJS)\ifacecheck.lbc option quiet @%append $(OBJS)\ifacecheck.lbc name $^@ @%append $(OBJS)\ifacecheck.lbc option caseexact - @%append $(OBJS)\ifacecheck.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' + @%append $(OBJS)\ifacecheck.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) @for %i in ($(IFACECHECK_OBJECTS)) do @%append $(OBJS)\ifacecheck.lbc file %i @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\ifacecheck.lbc library %i @%append $(OBJS)\ifacecheck.lbc diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in index 734eed5ee0..63d2a4f6ed 100644 --- a/utils/wxrc/Makefile.in +++ b/utils/wxrc/Makefile.in @@ -110,7 +110,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile @COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS) -@COND_USE_XRC_1@ $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) +@COND_USE_XRC_1@ $(CXX) -o $@ $(WXRC_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) @COND_USE_XRC_1@ @COND_USE_XRC_1@ $(__wxrc___mac_setfilecmd) @@ -129,7 +129,16 @@ wxrc_wxrc.o: $(srcdir)/wxrc.cpp $(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $(srcdir)/wxrc.cpp +$(srcdir)/include/wx/stc/stc.h: \ +$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ +$(srcdir)/src/stc/stc.cpp.in \ +$(srcdir)/src/stc/stc.h.in \ +$(srcdir)/src/stc/gen_iface.py + cd $(srcdir)/src/stc && ./gen_iface.py +monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ +$(srcdir)/include/wx/stc/stc.h + # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean install_wxrc uninstall_wxrc diff --git a/utils/wxrc/makefile.bcc b/utils/wxrc/makefile.bcc index b8d07a19f5..c10b18defe 100644 --- a/utils/wxrc/makefile.bcc +++ b/utils/wxrc/makefile.bcc @@ -191,7 +191,7 @@ clean: !if "$(USE_XRC)" == "1" $(OBJS)\wxrc.exe: $(WXRC_OBJECTS) - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&| + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&| c0x32.obj $(WXRC_OBJECTS),$@,, $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, | !endif diff --git a/utils/wxrc/makefile.gcc b/utils/wxrc/makefile.gcc index 3a1fc32507..589289d3d2 100644 --- a/utils/wxrc/makefile.gcc +++ b/utils/wxrc/makefile.gcc @@ -12,7 +12,7 @@ include ../../build/msw/config.gcc ### Variables: ### -CPPDEPS = -MT$@ -MF$@.d -MD +CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ @@ -183,7 +183,7 @@ clean: ifeq ($(USE_XRC),1) $(OBJS)\wxrc.exe: $(WXRC_OBJECTS) - $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(WXRC_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 endif $(OBJS)\wxrc_wxrc.o: ./wxrc.cpp diff --git a/utils/wxrc/makefile.vc b/utils/wxrc/makefile.vc index cc7c74d500..814e6cf74f 100644 --- a/utils/wxrc/makefile.vc +++ b/utils/wxrc/makefile.vc @@ -248,7 +248,7 @@ clean: !if "$(USE_XRC)" == "1" $(OBJS)\wxrc.exe: $(WXRC_OBJECTS) - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxrc.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxrc.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< $(WXRC_OBJECTS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << !endif diff --git a/utils/wxrc/makefile.wat b/utils/wxrc/makefile.wat index 8963f5e1ef..32c13b35b1 100644 --- a/utils/wxrc/makefile.wat +++ b/utils/wxrc/makefile.wat @@ -243,7 +243,7 @@ $(OBJS)\wxrc.exe : $(WXRC_OBJECTS) @%append $(OBJS)\wxrc.lbc option quiet @%append $(OBJS)\wxrc.lbc name $^@ @%append $(OBJS)\wxrc.lbc option caseexact - @%append $(OBJS)\wxrc.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' + @%append $(OBJS)\wxrc.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) @for %i in ($(WXRC_OBJECTS)) do @%append $(OBJS)\wxrc.lbc file %i @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\wxrc.lbc library %i @%append $(OBJS)\wxrc.lbc diff --git a/wxGTK.spec b/wxGTK.spec index 70c774138b..5394e40cef 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -347,6 +347,7 @@ wx/unix/evtloop.h wx/unix/pipe.h wx/unix/stdpaths.h wx/unix/stackwalk.h +wx/unix/tls.h wx/unix/execute.h wx/unix/mimetype.h wx/unix/private.h diff --git a/wxMotif.spec b/wxMotif.spec index 848e783fef..1699d43604 100644 --- a/wxMotif.spec +++ b/wxMotif.spec @@ -252,6 +252,7 @@ wx/unix/evtloop.h wx/unix/pipe.h wx/unix/stdpaths.h wx/unix/stackwalk.h +wx/unix/tls.h wx/unix/execute.h wx/unix/mimetype.h wx/unix/private.h diff --git a/wxX11.spec b/wxX11.spec index d38d811ba2..dc56045691 100644 --- a/wxX11.spec +++ b/wxX11.spec @@ -276,6 +276,7 @@ wx/unix/evtloop.h wx/unix/pipe.h wx/unix/stdpaths.h wx/unix/stackwalk.h +wx/unix/tls.h wx/unix/execute.h wx/unix/mimetype.h wx/unix/private.h -- 2.45.2