From 250700e4ac15d849686ba5c2e7d6cb8289d789cb Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sun, 20 Jul 2003 00:06:37 +0000 Subject: [PATCH] A new set of baked makefiles git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 2 +- autoconf_inc.m4 | 86 ++--- build/config.bcc | 2 +- build/config.gcc | 2 +- build/config.vc | 2 +- build/config.wat | 2 +- build/makefile.bcc | 12 +- build/makefile.gcc | 2 +- build/makefile.vc | 2 +- build/makefile.wat | 2 +- configure | 104 +++--- contrib/build/animate/makefile.bcc | 168 ++++++++++ contrib/build/animate/makefile.gcc | 124 +++++++ contrib/build/animate/makefile.vc | 141 ++++++++ contrib/build/animate/makefile.wat | 178 ++++++++++ contrib/build/fl/makefile.bcc | 259 +++++++++++++++ contrib/build/fl/makefile.gcc | 220 +++++++++++++ contrib/build/fl/makefile.vc | 237 ++++++++++++++ contrib/build/fl/makefile.wat | 274 ++++++++++++++++ contrib/build/gizmos/makefile.bcc | 194 +++++++++++ contrib/build/gizmos/makefile.gcc | 154 +++++++++ contrib/build/gizmos/makefile.vc | 171 ++++++++++ contrib/build/gizmos/makefile.wat | 208 ++++++++++++ contrib/build/ogl/makefile.bcc | 230 +++++++++++++ contrib/build/ogl/makefile.gcc | 190 +++++++++++ contrib/build/ogl/makefile.vc | 207 ++++++++++++ contrib/build/ogl/makefile.wat | 244 ++++++++++++++ contrib/build/stc/makefile.bcc | 454 ++++++++++++++++++++++++++ contrib/build/stc/makefile.gcc | 412 +++++++++++++++++++++++ contrib/build/stc/makefile.vc | 429 ++++++++++++++++++++++++ contrib/build/stc/makefile.wat | 466 +++++++++++++++++++++++++++ contrib/build/xrc/makefile.bcc | 4 +- contrib/build/xrc/makefile.gcc | 2 +- contrib/build/xrc/makefile.vc | 2 +- contrib/build/xrc/makefile.wat | 2 +- contrib/samples/animate/Makefile.in | 50 ++- contrib/samples/animate/makefile.bcc | 125 +++++++ contrib/samples/animate/makefile.gcc | 98 ++++++ contrib/samples/animate/makefile.vc | 119 ++++++- contrib/samples/animate/makefile.wat | 155 ++++++++- contrib/samples/xrc/Makefile.in | 73 ++++- contrib/samples/xrc/makefile.bcc | 153 +++++++++ contrib/samples/xrc/makefile.gcc | 125 +++++++ contrib/samples/xrc/makefile.vc | 145 ++++++++- contrib/samples/xrc/makefile.wat | 164 ++++++++++ contrib/src/animate/Makefile.in | 116 ++++--- contrib/src/fl/Makefile.in | 115 ++++--- contrib/src/gizmos/Makefile.in | 118 ++++--- contrib/src/ogl/Makefile.in | 2 +- contrib/src/stc/Makefile.in | 2 +- contrib/src/xrc/Makefile.in | 130 +++++--- samples/Makefile.in | 2 +- samples/access/Makefile.in | 67 ++-- samples/access/makefile.bcc | 135 ++++++++ samples/access/makefile.gcc | 64 ++-- samples/access/makefile.vc | 76 +++-- samples/access/makefile.wat | 152 ++++++++- samples/artprov/Makefile.in | 67 ++-- samples/artprov/makefile.bcc | 107 +++--- samples/artprov/makefile.gcc | 64 ++-- samples/artprov/makefile.vc | 76 +++-- samples/artprov/makefile.wat | 162 +++++++++- samples/calendar/Makefile.in | 67 ++-- samples/calendar/makefile.bcc | 107 +++--- samples/calendar/makefile.gcc | 64 ++-- samples/calendar/makefile.vc | 76 +++-- samples/calendar/makefile.wat | 159 ++++++++- samples/caret/Makefile.in | 67 ++-- samples/caret/makefile.bcc | 107 +++--- samples/caret/makefile.gcc | 64 ++-- samples/caret/makefile.vc | 76 +++-- samples/caret/makefile.wat | 159 ++++++++- samples/checklst/Makefile.in | 67 ++-- samples/checklst/makefile.bcc | 135 ++++++++ samples/checklst/makefile.gcc | 64 ++-- samples/checklst/makefile.vc | 76 +++-- samples/checklst/makefile.wat | 159 ++++++++- samples/config/Makefile.in | 67 ++-- samples/config/makefile.bcc | 107 +++--- samples/config/makefile.gcc | 64 ++-- samples/config/makefile.vc | 76 +++-- samples/config/makefile.wat | 159 ++++++++- samples/console/Makefile.in | 37 ++- samples/console/makefile.bcc | 90 ++---- samples/console/makefile.gcc | 49 +-- samples/console/makefile.vc | 48 +-- samples/console/makefile.wat | 50 +-- samples/controls/Makefile.in | 67 ++-- samples/controls/makefile.bcc | 107 +++--- samples/controls/makefile.gcc | 64 ++-- samples/controls/makefile.vc | 76 +++-- samples/controls/makefile.wat | 159 ++++++++- samples/db/Makefile.in | 67 ++-- samples/db/makefile.bcc | 138 ++++++++ samples/db/makefile.gcc | 64 ++-- samples/db/makefile.vc | 76 +++-- samples/db/makefile.wat | 162 +++++++++- samples/dialogs/Makefile.in | 67 ++-- samples/dialogs/makefile.bcc | 93 ++---- samples/dialogs/makefile.gcc | 49 +-- samples/dialogs/makefile.vc | 48 +-- samples/dialogs/makefile.wat | 50 +-- samples/dialup/Makefile.in | 67 ++-- samples/dialup/makefile.bcc | 107 +++--- samples/dialup/makefile.gcc | 64 ++-- samples/dialup/makefile.vc | 76 +++-- samples/dialup/makefile.wat | 159 ++++++++- samples/display/Makefile.in | 49 ++- samples/display/makefile.bcc | 120 +++++++ samples/display/makefile.gcc | 64 ++-- samples/display/makefile.vc | 110 +++++++ samples/display/makefile.wat | 144 +++++++++ samples/dnd/Makefile.in | 64 ++-- samples/dnd/makefile.bcc | 139 ++++++++ samples/dnd/makefile.gcc | 65 ++-- samples/dnd/makefile.vc | 77 +++-- samples/dnd/makefile.wat | 163 +++++++++- samples/docview/Makefile.in | 71 ++-- samples/docview/makefile.bcc | 107 +++--- samples/docview/makefile.gcc | 64 ++-- samples/docview/makefile.vc | 76 +++-- samples/docview/makefile.wat | 165 +++++++++- samples/docvwmdi/Makefile.in | 67 ++-- samples/docvwmdi/makefile.bcc | 107 +++--- samples/docvwmdi/makefile.gcc | 64 ++-- samples/docvwmdi/makefile.vc | 76 +++-- samples/docvwmdi/makefile.wat | 165 +++++++++- samples/dragimag/Makefile.in | 67 ++-- samples/dragimag/makefile.bcc | 108 +++---- samples/dragimag/makefile.gcc | 65 ++-- samples/dragimag/makefile.vc | 77 +++-- samples/dragimag/makefile.wat | 163 +++++++++- samples/drawing/Makefile.in | 67 ++-- samples/drawing/makefile.bcc | 108 +++---- samples/drawing/makefile.gcc | 65 ++-- samples/drawing/makefile.vc | 77 +++-- samples/drawing/makefile.wat | 163 +++++++++- samples/dynamic/Makefile.in | 67 ++-- samples/dynamic/makefile.bcc | 107 +++--- samples/dynamic/makefile.gcc | 64 ++-- samples/dynamic/makefile.vc | 76 +++-- samples/dynamic/makefile.wat | 159 ++++++++- samples/erase/Makefile.in | 67 ++-- samples/erase/makefile.bcc | 107 +++--- samples/erase/makefile.gcc | 64 ++-- samples/erase/makefile.vc | 76 +++-- samples/erase/makefile.wat | 159 ++++++++- samples/event/Makefile.in | 67 ++-- samples/event/makefile.bcc | 107 +++--- samples/event/makefile.gcc | 64 ++-- samples/event/makefile.vc | 76 +++-- samples/event/makefile.wat | 159 ++++++++- samples/exec/Makefile.in | 67 ++-- samples/exec/makefile.bcc | 107 +++--- samples/exec/makefile.gcc | 64 ++-- samples/exec/makefile.vc | 76 +++-- samples/exec/makefile.wat | 159 ++++++++- samples/font/Makefile.in | 67 ++-- samples/font/makefile.bcc | 107 +++--- samples/font/makefile.gcc | 64 ++-- samples/font/makefile.vc | 76 +++-- samples/font/makefile.wat | 159 ++++++++- samples/grid/Makefile.in | 67 ++-- samples/grid/makefile.bcc | 113 +++---- samples/grid/makefile.gcc | 64 ++-- samples/grid/makefile.vc | 82 +++-- samples/grid/makefile.wat | 159 ++++++++- samples/help/Makefile.in | 71 ++-- samples/help/makefile.bcc | 111 +++---- samples/help/makefile.gcc | 68 ++-- samples/help/makefile.vc | 80 +++-- samples/help/makefile.wat | 159 ++++++++- samples/htlbox/Makefile.in | 70 ++-- samples/htlbox/makefile.bcc | 139 ++++++++ samples/htlbox/makefile.gcc | 67 ++-- samples/htlbox/makefile.vc | 128 ++++++++ samples/htlbox/makefile.wat | 151 +++++++++ samples/html/Makefile.in | 2 +- samples/html/about/Makefile.in | 70 ++-- samples/html/about/makefile.bcc | 143 ++++++++ samples/html/about/makefile.gcc | 116 +++++++ samples/html/about/makefile.vc | 132 ++++++++ samples/html/about/makefile.wat | 167 +++++++++- samples/html/help/Makefile.in | 70 ++-- samples/html/help/makefile.bcc | 143 ++++++++ samples/html/help/makefile.gcc | 116 +++++++ samples/html/help/makefile.vc | 132 ++++++++ samples/html/help/makefile.wat | 167 +++++++++- samples/html/helpview/Makefile.in | 70 ++-- samples/html/helpview/makefile.bcc | 143 ++++++++ samples/html/helpview/makefile.gcc | 116 +++++++ samples/html/helpview/makefile.vc | 132 ++++++++ samples/html/helpview/makefile.wat | 167 +++++++++- samples/html/makefile.bcc | 58 ++++ samples/html/makefile.gcc | 51 +++ samples/html/makefile.vc | 66 ++++ samples/html/makefile.wat | 138 ++++---- samples/html/printing/Makefile.in | 70 ++-- samples/html/printing/makefile.bcc | 143 ++++++++ samples/html/printing/makefile.gcc | 116 +++++++ samples/html/printing/makefile.vc | 132 ++++++++ samples/html/printing/makefile.wat | 167 +++++++++- samples/html/test/Makefile.in | 70 ++-- samples/html/test/makefile.bcc | 143 ++++++++ samples/html/test/makefile.gcc | 116 +++++++ samples/html/test/makefile.vc | 132 ++++++++ samples/html/test/makefile.wat | 167 +++++++++- samples/html/virtual/Makefile.in | 70 ++-- samples/html/virtual/makefile.bcc | 143 ++++++++ samples/html/virtual/makefile.gcc | 116 +++++++ samples/html/virtual/makefile.vc | 132 ++++++++ samples/html/virtual/makefile.wat | 167 +++++++++- samples/html/widget/Makefile.in | 70 ++-- samples/html/widget/makefile.bcc | 143 ++++++++ samples/html/widget/makefile.gcc | 116 +++++++ samples/html/widget/makefile.vc | 132 ++++++++ samples/html/widget/makefile.wat | 167 +++++++++- samples/html/zip/Makefile.in | 67 ++-- samples/html/zip/makefile.bcc | 143 ++++++++ samples/html/zip/makefile.gcc | 116 +++++++ samples/html/zip/makefile.vc | 132 ++++++++ samples/html/zip/makefile.wat | 167 +++++++++- samples/image/Makefile.in | 67 ++-- samples/image/makefile.bcc | 108 +++---- samples/image/makefile.gcc | 65 ++-- samples/image/makefile.vc | 77 +++-- samples/image/makefile.wat | 163 +++++++++- samples/internat/Makefile.in | 67 ++-- samples/internat/makefile.bcc | 107 +++--- samples/internat/makefile.gcc | 64 ++-- samples/internat/makefile.vc | 76 +++-- samples/internat/makefile.wat | 159 ++++++++- samples/ipc/Makefile.in | 64 ++-- samples/ipc/makefile.bcc | 135 ++++++++ samples/ipc/makefile.gcc | 64 ++-- samples/ipc/makefile.vc | 76 +++-- samples/ipc/makefile.wat | 164 +++++++++- samples/joytest/Makefile.in | 67 ++-- samples/joytest/makefile.bcc | 107 +++--- samples/joytest/makefile.gcc | 64 ++-- samples/joytest/makefile.vc | 76 +++-- samples/joytest/makefile.wat | 159 ++++++++- samples/keyboard/Makefile.in | 67 ++-- samples/keyboard/makefile.bcc | 107 +++--- samples/keyboard/makefile.gcc | 64 ++-- samples/keyboard/makefile.vc | 76 +++-- samples/keyboard/makefile.wat | 159 ++++++++- samples/layout/Makefile.in | 67 ++-- samples/layout/makefile.bcc | 107 +++--- samples/layout/makefile.gcc | 64 ++-- samples/layout/makefile.vc | 76 +++-- samples/layout/makefile.wat | 159 ++++++++- samples/listbox/Makefile.in | 67 ++-- samples/listbox/makefile.bcc | 135 ++++++++ samples/listbox/makefile.gcc | 64 ++-- samples/listbox/makefile.vc | 125 +++++++ samples/listbox/makefile.wat | 147 +++++++++ samples/listctrl/Makefile.in | 67 ++-- samples/listctrl/makefile.bcc | 113 +++---- samples/listctrl/makefile.gcc | 64 ++-- samples/listctrl/makefile.vc | 82 +++-- samples/listctrl/makefile.wat | 159 ++++++++- samples/makefile.bcc | 54 ++++ samples/makefile.gcc | 31 +- samples/makefile.vc | 44 +-- samples/makefile.wat | 337 ++++--------------- samples/mdi/Makefile.in | 64 ++-- samples/mdi/makefile.bcc | 107 +++--- samples/mdi/makefile.gcc | 64 ++-- samples/mdi/makefile.vc | 76 +++-- samples/mdi/makefile.wat | 159 ++++++++- samples/memcheck/Makefile.in | 67 ++-- samples/memcheck/makefile.bcc | 107 +++--- samples/memcheck/makefile.gcc | 64 ++-- samples/memcheck/makefile.vc | 76 +++-- samples/memcheck/makefile.wat | 159 ++++++++- samples/menu/Makefile.in | 67 ++-- samples/menu/makefile.bcc | 107 +++--- samples/menu/makefile.gcc | 64 ++-- samples/menu/makefile.vc | 76 +++-- samples/menu/makefile.wat | 159 ++++++++- samples/mfc/Makefile.in | 64 ++-- samples/mfc/makefile.bcc | 107 +++--- samples/mfc/makefile.gcc | 64 ++-- samples/mfc/makefile.vc | 76 +++-- samples/mfc/makefile.wat | 159 ++++++++- samples/minifram/Makefile.in | 67 ++-- samples/minifram/makefile.bcc | 107 +++--- samples/minifram/makefile.gcc | 64 ++-- samples/minifram/makefile.vc | 76 +++-- samples/minifram/makefile.wat | 159 ++++++++- samples/minimal/Makefile.in | 70 ++-- samples/minimal/makefile.bcc | 93 ++---- samples/minimal/makefile.gcc | 49 +-- samples/minimal/makefile.vc | 48 +-- samples/minimal/makefile.wat | 50 +-- samples/mobile/Makefile.in | 67 ++-- samples/mobile/makefile.bcc | 135 ++++++++ samples/mobile/makefile.gcc | 64 ++-- samples/mobile/makefile.vc | 125 +++++++ samples/mobile/makefile.wat | 147 +++++++++ samples/multimon/Makefile.in | 67 ++-- samples/multimon/makefile.bcc | 135 ++++++++ samples/multimon/makefile.gcc | 64 ++-- samples/multimon/makefile.vc | 125 +++++++ samples/multimon/makefile.wat | 147 +++++++++ samples/nativdlg/Makefile.in | 67 ++-- samples/nativdlg/makefile.bcc | 107 +++--- samples/nativdlg/makefile.gcc | 64 ++-- samples/nativdlg/makefile.vc | 76 +++-- samples/nativdlg/makefile.wat | 159 ++++++++- samples/newgrid/Makefile.in | 67 ++-- samples/newgrid/makefile.bcc | 135 ++++++++ samples/newgrid/makefile.gcc | 64 ++-- samples/newgrid/makefile.vc | 125 +++++++ samples/newgrid/makefile.wat | 147 +++++++++ samples/notebook/Makefile.in | 67 ++-- samples/notebook/makefile.bcc | 107 +++--- samples/notebook/makefile.gcc | 64 ++-- samples/notebook/makefile.vc | 76 +++-- samples/notebook/makefile.wat | 159 ++++++++- samples/oleauto/Makefile.in | 67 ++-- samples/oleauto/makefile.bcc | 135 ++++++++ samples/oleauto/makefile.gcc | 64 ++-- samples/oleauto/makefile.vc | 76 +++-- samples/oleauto/makefile.wat | 159 ++++++++- samples/opengl/Makefile.in | 87 +---- samples/opengl/cube/Makefile.in | 157 +++++++-- samples/opengl/cube/makefile.bcc | 144 ++++++++- samples/opengl/cube/makefile.gcc | 109 +++++++ samples/opengl/cube/makefile.vc | 139 ++++++-- samples/opengl/cube/makefile.wat | 154 ++++++++- samples/opengl/makefile.bcc | 37 +++ samples/opengl/makefile.gcc | 117 +------ samples/opengl/makefile.vc | 31 ++ samples/opengl/makefile.wat | 49 +++ samples/ownerdrw/Makefile.in | 67 ++-- samples/ownerdrw/makefile.bcc | 107 +++--- samples/ownerdrw/makefile.gcc | 64 ++-- samples/ownerdrw/makefile.vc | 76 +++-- samples/ownerdrw/makefile.wat | 159 ++++++++- samples/png/Makefile.in | 72 +++-- samples/png/makefile.bcc | 113 +++---- samples/png/makefile.gcc | 70 ++-- samples/png/makefile.vc | 82 +++-- samples/png/makefile.wat | 159 ++++++++- samples/printing/Makefile.in | 67 ++-- samples/printing/makefile.bcc | 107 +++--- samples/printing/makefile.gcc | 64 ++-- samples/printing/makefile.vc | 76 +++-- samples/printing/makefile.wat | 159 ++++++++- samples/propsize/Makefile.in | 67 ++-- samples/propsize/makefile.bcc | 107 +++--- samples/propsize/makefile.gcc | 64 ++-- samples/propsize/makefile.vc | 76 +++-- samples/propsize/makefile.wat | 159 ++++++++- samples/regtest/Makefile.in | 67 ++-- samples/regtest/makefile.bcc | 135 ++++++++ samples/regtest/makefile.gcc | 64 ++-- samples/regtest/makefile.vc | 76 +++-- samples/regtest/makefile.wat | 159 ++++++++- samples/richedit/Makefile.in | 67 ++-- samples/richedit/makefile.bcc | 135 ++++++++ samples/richedit/makefile.gcc | 64 ++-- samples/richedit/makefile.vc | 76 +++-- samples/richedit/makefile.wat | 147 +++++++++ samples/rotate/Makefile.in | 67 ++-- samples/rotate/makefile.bcc | 135 ++++++++ samples/rotate/makefile.gcc | 64 ++-- samples/rotate/makefile.vc | 76 +++-- samples/rotate/makefile.wat | 159 ++++++++- samples/sashtest/Makefile.in | 67 ++-- samples/sashtest/makefile.bcc | 107 +++--- samples/sashtest/makefile.gcc | 64 ++-- samples/sashtest/makefile.vc | 76 +++-- samples/sashtest/makefile.wat | 159 ++++++++- samples/scroll/Makefile.in | 67 ++-- samples/scroll/makefile.bcc | 107 +++--- samples/scroll/makefile.gcc | 64 ++-- samples/scroll/makefile.vc | 76 +++-- samples/scroll/makefile.wat | 159 ++++++++- samples/scrollsub/Makefile.in | 67 ++-- samples/scrollsub/makefile.bcc | 107 +++--- samples/scrollsub/makefile.gcc | 64 ++-- samples/scrollsub/makefile.vc | 76 +++-- samples/scrollsub/makefile.wat | 159 ++++++++- samples/shaped/Makefile.in | 67 ++-- samples/shaped/makefile.bcc | 107 +++--- samples/shaped/makefile.gcc | 64 ++-- samples/shaped/makefile.vc | 76 +++-- samples/shaped/makefile.wat | 148 ++++++++- samples/sockets/Makefile.in | 136 +++++--- samples/sockets/makefile.bcc | 153 +++++++++ samples/sockets/makefile.gcc | 95 +++--- samples/sockets/makefile.vc | 107 +++--- samples/sockets/makefile.wat | 183 ++++++++++- samples/splitter/Makefile.in | 67 ++-- samples/splitter/makefile.bcc | 107 +++--- samples/splitter/makefile.gcc | 64 ++-- samples/splitter/makefile.vc | 76 +++-- samples/splitter/makefile.wat | 159 ++++++++- samples/statbar/Makefile.in | 67 ++-- samples/statbar/makefile.bcc | 107 +++--- samples/statbar/makefile.gcc | 64 ++-- samples/statbar/makefile.vc | 76 +++-- samples/statbar/makefile.wat | 159 ++++++++- samples/tab/Makefile.in | 64 ++-- samples/tab/makefile.bcc | 107 +++--- samples/tab/makefile.gcc | 64 ++-- samples/tab/makefile.vc | 76 +++-- samples/tab/makefile.wat | 159 ++++++++- samples/taskbar/Makefile.in | 75 +++-- samples/taskbar/makefile.bcc | 135 ++++++++ samples/taskbar/makefile.gcc | 70 ++-- samples/taskbar/makefile.vc | 82 +++-- samples/taskbar/makefile.wat | 159 ++++++++- samples/text/Makefile.in | 67 ++-- samples/text/makefile.bcc | 107 +++--- samples/text/makefile.gcc | 64 ++-- samples/text/makefile.vc | 76 +++-- samples/text/makefile.wat | 159 ++++++++- samples/thread/Makefile.in | 67 ++-- samples/thread/makefile.bcc | 107 +++--- samples/thread/makefile.gcc | 64 ++-- samples/thread/makefile.vc | 76 +++-- samples/thread/makefile.wat | 159 ++++++++- samples/toolbar/Makefile.in | 67 ++-- samples/toolbar/makefile.bcc | 107 +++--- samples/toolbar/makefile.gcc | 64 ++-- samples/toolbar/makefile.vc | 76 +++-- samples/toolbar/makefile.wat | 159 ++++++++- samples/treectrl/Makefile.in | 67 ++-- samples/treectrl/makefile.bcc | 113 +++---- samples/treectrl/makefile.gcc | 64 ++-- samples/treectrl/makefile.vc | 82 +++-- samples/treectrl/makefile.wat | 159 ++++++++- samples/typetest/Makefile.in | 67 ++-- samples/typetest/makefile.bcc | 107 +++--- samples/typetest/makefile.gcc | 64 ++-- samples/typetest/makefile.vc | 76 +++-- samples/typetest/makefile.wat | 159 ++++++++- samples/validate/Makefile.in | 67 ++-- samples/validate/makefile.bcc | 107 +++--- samples/validate/makefile.gcc | 64 ++-- samples/validate/makefile.vc | 76 +++-- samples/validate/makefile.wat | 159 ++++++++- samples/vscroll/Makefile.in | 67 ++-- samples/vscroll/makefile.bcc | 135 ++++++++ samples/vscroll/makefile.gcc | 64 ++-- samples/vscroll/makefile.vc | 125 +++++++ samples/vscroll/makefile.wat | 147 +++++++++ samples/widgets/Makefile.in | 67 ++-- samples/widgets/makefile.bcc | 107 +++--- samples/widgets/makefile.gcc | 64 ++-- samples/widgets/makefile.vc | 76 +++-- samples/widgets/makefile.wat | 189 ++++++++++- samples/wizard/Makefile.in | 67 ++-- samples/wizard/makefile.bcc | 107 +++--- samples/wizard/makefile.gcc | 64 ++-- samples/wizard/makefile.vc | 76 +++-- samples/wizard/makefile.wat | 159 ++++++++- samples/wxtest/Makefile.in | 67 ++-- samples/wxtest/makefile.bcc | 135 ++++++++ samples/wxtest/makefile.gcc | 64 ++-- samples/wxtest/makefile.vc | 76 +++-- samples/wxtest/makefile.wat | 147 +++++++++ samples/xrc/Makefile.in | 73 ++++- samples/xrc/makefile.bcc | 153 +++++++++ samples/xrc/makefile.gcc | 125 +++++++ samples/xrc/makefile.vc | 145 ++++++++- samples/xrc/makefile.wat | 164 ++++++++++ src/stc/Makefile.in | 2 +- src/xrc/Makefile.in | 130 +++++--- 473 files changed, 35863 insertions(+), 12749 deletions(-) create mode 100644 contrib/build/animate/makefile.bcc create mode 100644 contrib/build/animate/makefile.gcc create mode 100644 contrib/build/animate/makefile.vc create mode 100644 contrib/build/animate/makefile.wat create mode 100644 contrib/build/fl/makefile.bcc create mode 100644 contrib/build/fl/makefile.gcc create mode 100644 contrib/build/fl/makefile.vc create mode 100644 contrib/build/fl/makefile.wat create mode 100644 contrib/build/gizmos/makefile.bcc create mode 100644 contrib/build/gizmos/makefile.gcc create mode 100644 contrib/build/gizmos/makefile.vc create mode 100644 contrib/build/gizmos/makefile.wat create mode 100644 contrib/build/ogl/makefile.bcc create mode 100644 contrib/build/ogl/makefile.gcc create mode 100644 contrib/build/ogl/makefile.vc create mode 100644 contrib/build/ogl/makefile.wat create mode 100644 contrib/build/stc/makefile.bcc create mode 100644 contrib/build/stc/makefile.gcc create mode 100644 contrib/build/stc/makefile.vc create mode 100644 contrib/build/stc/makefile.wat create mode 100644 contrib/samples/animate/makefile.bcc create mode 100644 contrib/samples/animate/makefile.gcc create mode 100644 contrib/samples/xrc/makefile.bcc create mode 100644 contrib/samples/xrc/makefile.gcc create mode 100644 contrib/samples/xrc/makefile.wat create mode 100644 samples/access/makefile.bcc create mode 100644 samples/checklst/makefile.bcc create mode 100644 samples/db/makefile.bcc create mode 100644 samples/display/makefile.bcc create mode 100644 samples/display/makefile.vc create mode 100644 samples/display/makefile.wat create mode 100644 samples/dnd/makefile.bcc create mode 100644 samples/htlbox/makefile.bcc create mode 100644 samples/htlbox/makefile.vc create mode 100644 samples/htlbox/makefile.wat create mode 100644 samples/html/about/makefile.bcc create mode 100644 samples/html/about/makefile.gcc create mode 100644 samples/html/about/makefile.vc create mode 100644 samples/html/help/makefile.bcc create mode 100644 samples/html/help/makefile.gcc create mode 100644 samples/html/help/makefile.vc create mode 100644 samples/html/helpview/makefile.bcc create mode 100644 samples/html/helpview/makefile.gcc create mode 100644 samples/html/helpview/makefile.vc create mode 100644 samples/html/makefile.bcc create mode 100644 samples/html/makefile.gcc create mode 100644 samples/html/makefile.vc create mode 100644 samples/html/printing/makefile.bcc create mode 100644 samples/html/printing/makefile.gcc create mode 100644 samples/html/printing/makefile.vc create mode 100644 samples/html/test/makefile.bcc create mode 100644 samples/html/test/makefile.gcc create mode 100644 samples/html/test/makefile.vc create mode 100644 samples/html/virtual/makefile.bcc create mode 100644 samples/html/virtual/makefile.gcc create mode 100644 samples/html/virtual/makefile.vc create mode 100644 samples/html/widget/makefile.bcc create mode 100644 samples/html/widget/makefile.gcc create mode 100644 samples/html/widget/makefile.vc create mode 100644 samples/html/zip/makefile.bcc create mode 100644 samples/html/zip/makefile.gcc create mode 100644 samples/html/zip/makefile.vc create mode 100644 samples/ipc/makefile.bcc create mode 100644 samples/listbox/makefile.bcc create mode 100644 samples/listbox/makefile.vc create mode 100644 samples/listbox/makefile.wat create mode 100644 samples/makefile.bcc create mode 100644 samples/mobile/makefile.bcc create mode 100644 samples/mobile/makefile.vc create mode 100644 samples/mobile/makefile.wat create mode 100644 samples/multimon/makefile.bcc create mode 100644 samples/multimon/makefile.vc create mode 100644 samples/multimon/makefile.wat create mode 100644 samples/newgrid/makefile.bcc create mode 100644 samples/newgrid/makefile.vc create mode 100644 samples/newgrid/makefile.wat create mode 100644 samples/oleauto/makefile.bcc create mode 100644 samples/opengl/cube/makefile.gcc create mode 100644 samples/opengl/makefile.bcc create mode 100644 samples/opengl/makefile.vc create mode 100644 samples/opengl/makefile.wat create mode 100644 samples/regtest/makefile.bcc create mode 100644 samples/richedit/makefile.bcc create mode 100644 samples/richedit/makefile.wat create mode 100644 samples/rotate/makefile.bcc create mode 100644 samples/sockets/makefile.bcc create mode 100644 samples/taskbar/makefile.bcc create mode 100644 samples/vscroll/makefile.bcc create mode 100644 samples/vscroll/makefile.vc create mode 100644 samples/vscroll/makefile.wat create mode 100644 samples/wxtest/makefile.bcc create mode 100644 samples/wxtest/makefile.wat create mode 100644 samples/xrc/makefile.bcc create mode 100644 samples/xrc/makefile.gcc create mode 100644 samples/xrc/makefile.wat diff --git a/Makefile.in b/Makefile.in index 29e60802ea..40bd5e9534 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 index 51ee352920..fd1286f427 100644 --- a/autoconf_inc.m4 +++ b/autoconf_inc.m4 @@ -1,5 +1,5 @@ dnl This macro was generated by -dnl Bakefile 0.1.1 (http://bakefile.sourceforge.net) +dnl Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) dnl Do not modify, all changes will be overwritten! dnl Conditions: @@ -46,6 +46,12 @@ dnl ### begin block COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 ### COND_MONOLITHIC_0_SHARED_0_USE_GUI_1="" fi AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1) +dnl ### begin block COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 ### + COND_MONOLITHIC_0_SHARED_0_USE_HTML_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_HTML" = "x1" ; then + COND_MONOLITHIC_0_SHARED_0_USE_HTML_1="" + fi + AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_HTML_1) dnl ### begin block COND_MONOLITHIC_0_SHARED_1 ### COND_MONOLITHIC_0_SHARED_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then @@ -58,6 +64,12 @@ dnl ### begin block COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 ### COND_MONOLITHIC_0_SHARED_1_USE_GUI_1="" fi AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1) +dnl ### begin block COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 ### + COND_MONOLITHIC_0_SHARED_1_USE_HTML_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_HTML" = "x1" ; then + COND_MONOLITHIC_0_SHARED_1_USE_HTML_1="" + fi + AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_HTML_1) dnl ### begin block COND_MONOLITHIC_1 ### COND_MONOLITHIC_1="#" if test "x$MONOLITHIC" = "x1" ; then @@ -100,6 +112,24 @@ dnl ### begin block COND_PLATFORM_MACOSX_1 ### COND_PLATFORM_MACOSX_1="" fi AC_SUBST(COND_PLATFORM_MACOSX_1) +dnl ### begin block COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA ### + COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="" + fi + AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA) +dnl ### begin block COND_PLATFORM_MACOSX_1_TOOLKIT_GTK ### + COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="" + fi + AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_GTK) +dnl ### begin block COND_PLATFORM_MACOSX_1_TOOLKIT_MAC ### + COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="" + fi + AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MAC) dnl ### begin block COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 ### COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#" if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then @@ -124,6 +154,18 @@ dnl ### begin block COND_PLATFORM_WIN32_1 ### COND_PLATFORM_WIN32_1="" fi AC_SUBST(COND_PLATFORM_WIN32_1) +dnl ### begin block COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 ### + COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#" + if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then + COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="" + fi + AC_SUBST(COND_SHARED_0_USE_GUI_1_USE_OPENGL_1) +dnl ### begin block COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 ### + COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="#" + if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then + COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="" + fi + AC_SUBST(COND_SHARED_1_USE_GUI_1_USE_OPENGL_1) dnl ### begin block COND_TOOLKIT_COCOA ### COND_TOOLKIT_COCOA="#" if test "x$TOOLKIT" = "xCOCOA" ; then @@ -376,45 +418,3 @@ dnl ### begin block COND_SHARED_0 ### COND_SHARED_0="" fi AC_SUBST(COND_SHARED_0) -dnl ### begin block COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA ### - COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" ; then - COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="" - fi - AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA) -dnl ### begin block COND_PLATFORM_MACOSX_1_TOOLKIT_GTK ### - COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" ; then - COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="" - fi - AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_GTK) -dnl ### begin block COND_PLATFORM_MACOSX_1_TOOLKIT_MAC ### - COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" ; then - COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="" - fi - AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MAC) -dnl ### begin block COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 ### - COND_MONOLITHIC_0_SHARED_0_USE_HTML_1="#" - if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_HTML" = "x1" ; then - COND_MONOLITHIC_0_SHARED_0_USE_HTML_1="" - fi - AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_HTML_1) -dnl ### begin block COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 ### - COND_MONOLITHIC_0_SHARED_1_USE_HTML_1="#" - if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_HTML" = "x1" ; then - COND_MONOLITHIC_0_SHARED_1_USE_HTML_1="" - fi - AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_HTML_1) -dnl ### begin block COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 ### - COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#" - if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then - COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="" - fi - AC_SUBST(COND_SHARED_0_USE_GUI_1_USE_OPENGL_1) -dnl ### begin block COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 ### - COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="#" - if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then - COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="" - fi - AC_SUBST(COND_SHARED_1_USE_GUI_1_USE_OPENGL_1) diff --git a/build/config.bcc b/build/config.bcc index 22c077da26..c3d8aeee8b 100644 --- a/build/config.bcc +++ b/build/config.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/build/config.gcc b/build/config.gcc index 03d6ae3e32..3c85bed358 100644 --- a/build/config.gcc +++ b/build/config.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/build/config.vc b/build/config.vc index 2d583c69a3..f9efc0fda6 100644 --- a/build/config.vc +++ b/build/config.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/build/config.wat b/build/config.wat index 516eee0de5..d1ce3e59be 100644 --- a/build/config.wat +++ b/build/config.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/build/makefile.bcc b/build/makefile.bcc index 0a79314a68..ee2de9d500 100644 --- a/build/makefile.bcc +++ b/build/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -7301,7 +7301,7 @@ $(OBJS)\wxzlib_zutil.obj: ..\src\zlib\zutil.c !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\basedll_dummy.obj $(OBJS)\basedll_dummy.obj ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxzlib$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxregex$(WXDEBUGFLAG).lib $(OBJS)\basedll_appbase.obj $(OBJS)\basedll_clntdata.obj $(OBJS)\basedll_cmdline.obj $(OBJS)\basedll_config.obj $(OBJS)\basedll_datetime.obj $(OBJS)\basedll_datstrm.obj $(OBJS)\basedll_db.obj $(OBJS)\basedll_dbtable.obj $(OBJS)\basedll_dircmn.obj $(OBJS)\basedll_dynarray.obj $(OBJS)\basedll_dynlib.obj $(OBJS)\basedll_dynload.obj $(OBJS)\basedll_encconv.obj $(OBJS)\basedll_extended.obj $(OBJS)\basedll_ffile.obj $(OBJS)\basedll_file.obj $(OBJS)\basedll_fileconf.obj $(OBJS)\basedll_filefn.obj $(OBJS)\basedll_filename.obj $(OBJS)\basedll_filesys.obj $(OBJS)\basedll_fmapbase.obj $(OBJS)\basedll_fs_inet.obj $(OBJS)\basedll_fs_zip.obj $(OBJS)\basedll_ftp.obj $(OBJS)\basedll_hash.obj $(OBJS)\basedll_hashmap.obj $(OBJS)\basedll_http.obj $(OBJS)\basedll_init.obj $(OBJS)\basedll_intl.obj $(OBJS)\basedll_ipcbase.obj $(OBJS)\basedll_list.obj $(OBJS)\basedll_log.obj $(OBJS)\basedll_longlong.obj $(OBJS)\basedll_memory.obj $(OBJS)\basedll_mimecmn.obj $(OBJS)\basedll_module.obj $(OBJS)\basedll_mstream.obj $(OBJS)\basedll_object.obj $(OBJS)\basedll_process.obj $(OBJS)\basedll_protocol.obj $(OBJS)\basedll_regex.obj $(OBJS)\basedll_sckaddr.obj $(OBJS)\basedll_sckfile.obj $(OBJS)\basedll_sckipc.obj $(OBJS)\basedll_sckstrm.obj $(OBJS)\basedll_socket.obj $(OBJS)\basedll_stopwatch.obj $(OBJS)\basedll_strconv.obj $(OBJS)\basedll_stream.obj $(OBJS)\basedll_string.obj $(OBJS)\basedll_sysopt.obj $(OBJS)\basedll_textbuf.obj $(OBJS)\basedll_textfile.obj $(OBJS)\basedll_tokenzr.obj $(OBJS)\basedll_txtstrm.obj $(OBJS)\basedll_unzip.obj $(OBJS)\basedll_url.obj $(OBJS)\basedll_variant.obj $(OBJS)\basedll_wfstream.obj $(OBJS)\basedll_wxchar.obj $(OBJS)\basedll_zipstrm.obj $(OBJS)\basedll_zstream.obj $(OBJS)\basedll_gsocket.obj $(OBJS)\basedll_gsockmsw.obj $(OBJS)\basedll_basemsw.obj $(OBJS)\basedll_dde.obj $(OBJS)\basedll_dir.obj $(OBJS)\basedll_mimetype.obj $(OBJS)\basedll_regconf.obj $(OBJS)\basedll_registry.obj $(OBJS)\basedll_snglinst.obj $(OBJS)\basedll_thread.obj $(OBJS)\basedll_utils.obj $(OBJS)\basedll_utilsexc.obj $(OBJS)\basedll_crashrpt.obj $(OBJS)\basedll_event.obj $(OBJS)\basedll_fs_mem.obj $(OBJS)\basedll_msgout.obj $(OBJS)\basedll_utilscmn.obj $(OBJS)\basedll_main.obj $(OBJS)\basedll_mslu.obj $(OBJS)\basedll_volume.obj - ilink32 -Tpd $(LDFLAGS) $(__DEBUGFLAG) -L..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| c0d32.obj $(OBJS)\basedll_dummy.obj $(OBJS)\basedll_appbase.obj $(OBJS)\basedll_clntdata.obj $(OBJS)\basedll_cmdline.obj $(OBJS)\basedll_config.obj $(OBJS)\basedll_datetime.obj $(OBJS)\basedll_datstrm.obj $(OBJS)\basedll_db.obj $(OBJS)\basedll_dbtable.obj $(OBJS)\basedll_dircmn.obj $(OBJS)\basedll_dynarray.obj $(OBJS)\basedll_dynlib.obj $(OBJS)\basedll_dynload.obj $(OBJS)\basedll_encconv.obj $(OBJS)\basedll_extended.obj $(OBJS)\basedll_ffile.obj $(OBJS)\basedll_file.obj $(OBJS)\basedll_fileconf.obj $(OBJS)\basedll_filefn.obj $(OBJS)\basedll_filename.obj $(OBJS)\basedll_filesys.obj $(OBJS)\basedll_fmapbase.obj $(OBJS)\basedll_fs_inet.obj $(OBJS)\basedll_fs_zip.obj $(OBJS)\basedll_ftp.obj $(OBJS)\basedll_hash.obj $(OBJS)\basedll_hashmap.obj $(OBJS)\basedll_http.obj $(OBJS)\basedll_init.obj $(OBJS)\basedll_intl.obj $(OBJS)\basedll_ipcbase.obj $(OBJS)\basedll_list.obj $(OBJS)\basedll_log.obj $(OBJS)\basedll_longlong.obj $(OBJS)\basedll_memory.obj $(OBJS)\basedll_mimecmn.obj $(OBJS)\basedll_module.obj $(OBJS)\basedll_mstream.obj $(OBJS)\basedll_object.obj $(OBJS)\basedll_process.obj $(OBJS)\basedll_protocol.obj $(OBJS)\basedll_regex.obj $(OBJS)\basedll_sckaddr.obj $(OBJS)\basedll_sckfile.obj $(OBJS)\basedll_sckipc.obj $(OBJS)\basedll_sckstrm.obj $(OBJS)\basedll_socket.obj $(OBJS)\basedll_stopwatch.obj $(OBJS)\basedll_strconv.obj $(OBJS)\basedll_stream.obj $(OBJS)\basedll_string.obj $(OBJS)\basedll_sysopt.obj $(OBJS)\basedll_textbuf.obj $(OBJS)\basedll_textfile.obj $(OBJS)\basedll_tokenzr.obj $(OBJS)\basedll_txtstrm.obj $(OBJS)\basedll_unzip.obj $(OBJS)\basedll_url.obj $(OBJS)\basedll_variant.obj $(OBJS)\basedll_wfstream.obj $(OBJS)\basedll_wxchar.obj $(OBJS)\basedll_zipstrm.obj $(OBJS)\basedll_zstream.obj $(OBJS)\basedll_gsocket.obj $(OBJS)\basedll_gsockmsw.obj $(OBJS)\basedll_basemsw.obj $(OBJS)\basedll_dde.obj $(OBJS)\basedll_dir.obj $(OBJS)\basedll_mimetype.obj $(OBJS)\basedll_regconf.obj $(OBJS)\basedll_registry.obj $(OBJS)\basedll_snglinst.obj $(OBJS)\basedll_thread.obj $(OBJS)\basedll_utils.obj $(OBJS)\basedll_utilsexc.obj $(OBJS)\basedll_crashrpt.obj $(OBJS)\basedll_event.obj $(OBJS)\basedll_fs_mem.obj $(OBJS)\basedll_msgout.obj $(OBJS)\basedll_utilscmn.obj $(OBJS)\basedll_main.obj $(OBJS)\basedll_mslu.obj $(OBJS)\basedll_volume.obj,$@,, wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_2).lib,, | implib -f ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@ @@ -7341,7 +7341,7 @@ clean: !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\coredll_dummy.obj $(OBJS)\coredll_dummy.obj ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxtiff$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxjpeg$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxpng$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxzlib$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxregex$(WXDEBUGFLAG).lib $(OBJS)\coredll_event.obj $(OBJS)\coredll_fs_mem.obj $(OBJS)\coredll_msgout.obj $(OBJS)\coredll_utilscmn.obj $(OBJS)\coredll_main.obj $(OBJS)\coredll_mslu.obj $(OBJS)\coredll_volume.obj $(____CORE_SRC_FILENAMES_2_OBJECTS) $(__basedll___depname) - ilink32 -Tpd $(LDFLAGS) $(__DEBUGFLAG) -L..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| c0d32.obj $(OBJS)\coredll_dummy.obj $(OBJS)\coredll_event.obj $(OBJS)\coredll_fs_mem.obj $(OBJS)\coredll_msgout.obj $(OBJS)\coredll_utilscmn.obj $(OBJS)\coredll_main.obj $(OBJS)\coredll_mslu.obj $(OBJS)\coredll_volume.obj $(____CORE_SRC_FILENAMES_2_OBJECTS),$@,, wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib cw32mt$(__RUNTIME_LIBS_2).lib,, | implib -f ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core $@ @@ -7357,7 +7357,7 @@ clean: !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\gldll_dummy.obj $(OBJS)\gldll_dummy.obj ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxtiff$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxjpeg$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxpng$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxzlib$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxregex$(WXDEBUGFLAG).lib $(OBJS)\gldll_glcanvas.obj - ilink32 -Tpd $(LDFLAGS) $(__DEBUGFLAG) -L..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| c0d32.obj $(OBJS)\gldll_dummy.obj $(OBJS)\gldll_glcanvas.obj,$@,, wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) cw32mt$(__RUNTIME_LIBS_2).lib,, | implib -f ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl $@ @@ -7373,7 +7373,7 @@ clean: !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1" ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\htmldll_dummy.obj $(OBJS)\htmldll_dummy.obj ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxtiff$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxjpeg$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxpng$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxzlib$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxregex$(WXDEBUGFLAG).lib $(OBJS)\htmldll_helpbest.obj $(OBJS)\htmldll_helpdata.obj $(OBJS)\htmldll_helpfrm.obj $(OBJS)\htmldll_helpctrl.obj $(OBJS)\htmldll_htmlcell.obj $(OBJS)\htmldll_htmlfilt.obj $(OBJS)\htmldll_htmlpars.obj $(OBJS)\htmldll_htmltag.obj $(OBJS)\htmldll_htmlwin.obj $(OBJS)\htmldll_winpars.obj $(OBJS)\htmldll_m_fonts.obj $(OBJS)\htmldll_m_hline.obj $(OBJS)\htmldll_m_image.obj $(OBJS)\htmldll_m_layout.obj $(OBJS)\htmldll_m_links.obj $(OBJS)\htmldll_m_list.obj $(OBJS)\htmldll_m_dflist.obj $(OBJS)\htmldll_m_pre.obj $(OBJS)\htmldll_m_tables.obj $(OBJS)\htmldll_m_style.obj $(OBJS)\htmldll_htmprint.obj $(OBJS)\htmldll_htmllbox.obj $(__coredll___depname) $(__basedll___depname) - ilink32 -Tpd $(LDFLAGS) $(__DEBUGFLAG) -L..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| c0d32.obj $(OBJS)\htmldll_dummy.obj $(OBJS)\htmldll_helpbest.obj $(OBJS)\htmldll_helpdata.obj $(OBJS)\htmldll_helpfrm.obj $(OBJS)\htmldll_helpctrl.obj $(OBJS)\htmldll_htmlcell.obj $(OBJS)\htmldll_htmlfilt.obj $(OBJS)\htmldll_htmlpars.obj $(OBJS)\htmldll_htmltag.obj $(OBJS)\htmldll_htmlwin.obj $(OBJS)\htmldll_winpars.obj $(OBJS)\htmldll_m_fonts.obj $(OBJS)\htmldll_m_hline.obj $(OBJS)\htmldll_m_image.obj $(OBJS)\htmldll_m_layout.obj $(OBJS)\htmldll_m_links.obj $(OBJS)\htmldll_m_list.obj $(OBJS)\htmldll_m_dflist.obj $(OBJS)\htmldll_m_pre.obj $(OBJS)\htmldll_m_tables.obj $(OBJS)\htmldll_m_style.obj $(OBJS)\htmldll_htmprint.obj $(OBJS)\htmldll_htmllbox.obj,$@,, wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib cw32mt$(__RUNTIME_LIBS_2).lib,, | implib -f ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html $@ @@ -7395,7 +7395,7 @@ clean: !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx\setup.h $(OBJS)\monodll_dummy.obj $(OBJS)\monodll_dummy.obj ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxtiff$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxjpeg$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxpng$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxzlib$(WXDEBUGFLAG).lib ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wxregex$(WXDEBUGFLAG).lib $(OBJS)\monodll_appbase.obj $(OBJS)\monodll_clntdata.obj $(OBJS)\monodll_cmdline.obj $(OBJS)\monodll_config.obj $(OBJS)\monodll_datetime.obj $(OBJS)\monodll_datstrm.obj $(OBJS)\monodll_db.obj $(OBJS)\monodll_dbtable.obj $(OBJS)\monodll_dircmn.obj $(OBJS)\monodll_dynarray.obj $(OBJS)\monodll_dynlib.obj $(OBJS)\monodll_dynload.obj $(OBJS)\monodll_encconv.obj $(OBJS)\monodll_extended.obj $(OBJS)\monodll_ffile.obj $(OBJS)\monodll_file.obj $(OBJS)\monodll_fileconf.obj $(OBJS)\monodll_filefn.obj $(OBJS)\monodll_filename.obj $(OBJS)\monodll_filesys.obj $(OBJS)\monodll_fmapbase.obj $(OBJS)\monodll_fs_inet.obj $(OBJS)\monodll_fs_zip.obj $(OBJS)\monodll_ftp.obj $(OBJS)\monodll_hash.obj $(OBJS)\monodll_hashmap.obj $(OBJS)\monodll_http.obj $(OBJS)\monodll_init.obj $(OBJS)\monodll_intl.obj $(OBJS)\monodll_ipcbase.obj $(OBJS)\monodll_list.obj $(OBJS)\monodll_log.obj $(OBJS)\monodll_longlong.obj $(OBJS)\monodll_memory.obj $(OBJS)\monodll_mimecmn.obj $(OBJS)\monodll_module.obj $(OBJS)\monodll_mstream.obj $(OBJS)\monodll_object.obj $(OBJS)\monodll_process.obj $(OBJS)\monodll_protocol.obj $(OBJS)\monodll_regex.obj $(OBJS)\monodll_sckaddr.obj $(OBJS)\monodll_sckfile.obj $(OBJS)\monodll_sckipc.obj $(OBJS)\monodll_sckstrm.obj $(OBJS)\monodll_socket.obj $(OBJS)\monodll_stopwatch.obj $(OBJS)\monodll_strconv.obj $(OBJS)\monodll_stream.obj $(OBJS)\monodll_string.obj $(OBJS)\monodll_sysopt.obj $(OBJS)\monodll_textbuf.obj $(OBJS)\monodll_textfile.obj $(OBJS)\monodll_tokenzr.obj $(OBJS)\monodll_txtstrm.obj $(OBJS)\monodll_unzip.obj $(OBJS)\monodll_url.obj $(OBJS)\monodll_variant.obj $(OBJS)\monodll_wfstream.obj $(OBJS)\monodll_wxchar.obj $(OBJS)\monodll_zipstrm.obj $(OBJS)\monodll_zstream.obj $(OBJS)\monodll_gsocket.obj $(OBJS)\monodll_gsockmsw.obj $(OBJS)\monodll_basemsw.obj $(OBJS)\monodll_dde.obj $(OBJS)\monodll_dir.obj $(OBJS)\monodll_mimetype.obj $(OBJS)\monodll_regconf.obj $(OBJS)\monodll_registry.obj $(OBJS)\monodll_snglinst.obj $(OBJS)\monodll_thread.obj $(OBJS)\monodll_utils.obj $(OBJS)\monodll_utilsexc.obj $(OBJS)\monodll_crashrpt.obj $(OBJS)\monodll_event.obj $(OBJS)\monodll_fs_mem.obj $(OBJS)\monodll_msgout.obj $(OBJS)\monodll_utilscmn.obj $(OBJS)\monodll_main.obj $(OBJS)\monodll_mslu.obj $(OBJS)\monodll_volume.obj $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) - ilink32 -Tpd $(LDFLAGS) $(__DEBUGFLAG) -L..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| c0d32.obj $(OBJS)\monodll_dummy.obj $(OBJS)\monodll_appbase.obj $(OBJS)\monodll_clntdata.obj $(OBJS)\monodll_cmdline.obj $(OBJS)\monodll_config.obj $(OBJS)\monodll_datetime.obj $(OBJS)\monodll_datstrm.obj $(OBJS)\monodll_db.obj $(OBJS)\monodll_dbtable.obj $(OBJS)\monodll_dircmn.obj $(OBJS)\monodll_dynarray.obj $(OBJS)\monodll_dynlib.obj $(OBJS)\monodll_dynload.obj $(OBJS)\monodll_encconv.obj $(OBJS)\monodll_extended.obj $(OBJS)\monodll_ffile.obj $(OBJS)\monodll_file.obj $(OBJS)\monodll_fileconf.obj $(OBJS)\monodll_filefn.obj $(OBJS)\monodll_filename.obj $(OBJS)\monodll_filesys.obj $(OBJS)\monodll_fmapbase.obj $(OBJS)\monodll_fs_inet.obj $(OBJS)\monodll_fs_zip.obj $(OBJS)\monodll_ftp.obj $(OBJS)\monodll_hash.obj $(OBJS)\monodll_hashmap.obj $(OBJS)\monodll_http.obj $(OBJS)\monodll_init.obj $(OBJS)\monodll_intl.obj $(OBJS)\monodll_ipcbase.obj $(OBJS)\monodll_list.obj $(OBJS)\monodll_log.obj $(OBJS)\monodll_longlong.obj $(OBJS)\monodll_memory.obj $(OBJS)\monodll_mimecmn.obj $(OBJS)\monodll_module.obj $(OBJS)\monodll_mstream.obj $(OBJS)\monodll_object.obj $(OBJS)\monodll_process.obj $(OBJS)\monodll_protocol.obj $(OBJS)\monodll_regex.obj $(OBJS)\monodll_sckaddr.obj $(OBJS)\monodll_sckfile.obj $(OBJS)\monodll_sckipc.obj $(OBJS)\monodll_sckstrm.obj $(OBJS)\monodll_socket.obj $(OBJS)\monodll_stopwatch.obj $(OBJS)\monodll_strconv.obj $(OBJS)\monodll_stream.obj $(OBJS)\monodll_string.obj $(OBJS)\monodll_sysopt.obj $(OBJS)\monodll_textbuf.obj $(OBJS)\monodll_textfile.obj $(OBJS)\monodll_tokenzr.obj $(OBJS)\monodll_txtstrm.obj $(OBJS)\monodll_unzip.obj $(OBJS)\monodll_url.obj $(OBJS)\monodll_variant.obj $(OBJS)\monodll_wfstream.obj $(OBJS)\monodll_wxchar.obj $(OBJS)\monodll_zipstrm.obj $(OBJS)\monodll_zstream.obj $(OBJS)\monodll_gsocket.obj $(OBJS)\monodll_gsockmsw.obj $(OBJS)\monodll_basemsw.obj $(OBJS)\monodll_dde.obj $(OBJS)\monodll_dir.obj $(OBJS)\monodll_mimetype.obj $(OBJS)\monodll_regconf.obj $(OBJS)\monodll_registry.obj $(OBJS)\monodll_snglinst.obj $(OBJS)\monodll_thread.obj $(OBJS)\monodll_utils.obj $(OBJS)\monodll_utilsexc.obj $(OBJS)\monodll_crashrpt.obj $(OBJS)\monodll_event.obj $(OBJS)\monodll_fs_mem.obj $(OBJS)\monodll_msgout.obj $(OBJS)\monodll_utilscmn.obj $(OBJS)\monodll_main.obj $(OBJS)\monodll_mslu.obj $(OBJS)\monodll_volume.obj $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS),$@,, wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_2).lib,, | implib -f ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@ diff --git a/build/makefile.gcc b/build/makefile.gcc index e1c469726e..b4409511b5 100644 --- a/build/makefile.gcc +++ b/build/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/build/makefile.vc b/build/makefile.vc index 47864eda0c..699bebe3cf 100644 --- a/build/makefile.vc +++ b/build/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/build/makefile.wat b/build/makefile.wat index 3d034ef06e..cddd3a78f5 100644 --- a/build/makefile.wat +++ b/build/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/configure b/configure index 39fbc6a100..fda45d6ef8 100755 --- a/configure +++ b/configure @@ -311,7 +311,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG HOST_SUFFIX SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX DLLPREFIX AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_BUILD_DEBUG COND_BUILD_RELEASE COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY ESD_LINK LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG HOST_SUFFIX SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX DLLPREFIX AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_BUILD_DEBUG COND_BUILD_RELEASE COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY ESD_LINK LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -34154,6 +34154,11 @@ fi COND_MONOLITHIC_0_SHARED_0_USE_GUI_1="" fi + COND_MONOLITHIC_0_SHARED_0_USE_HTML_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_HTML" = "x1" ; then + COND_MONOLITHIC_0_SHARED_0_USE_HTML_1="" + fi + COND_MONOLITHIC_0_SHARED_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then COND_MONOLITHIC_0_SHARED_1="" @@ -34164,6 +34169,11 @@ fi COND_MONOLITHIC_0_SHARED_1_USE_GUI_1="" fi + COND_MONOLITHIC_0_SHARED_1_USE_HTML_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_HTML" = "x1" ; then + COND_MONOLITHIC_0_SHARED_1_USE_HTML_1="" + fi + COND_MONOLITHIC_1="#" if test "x$MONOLITHIC" = "x1" ; then COND_MONOLITHIC_1="" @@ -34199,6 +34209,21 @@ fi COND_PLATFORM_MACOSX_1="" fi + COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="" + fi + + COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="" + fi + + COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="" + fi + COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#" if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="" @@ -34219,6 +34244,16 @@ fi COND_PLATFORM_WIN32_1="" fi + COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#" + if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then + COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="" + fi + + COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="#" + if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then + COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="" + fi + COND_TOOLKIT_COCOA="#" if test "x$TOOLKIT" = "xCOCOA" ; then COND_TOOLKIT_COCOA="" @@ -34414,56 +34449,6 @@ fi COND_WXUSE_ZLIB_BUILTIN="" fi - COND_PLATFORM_MAC_1="#" - if test "x$PLATFORM_MAC" = "x1" ; then - COND_PLATFORM_MAC_1="" - fi - - COND_SHARED_1="#" - if test "x$SHARED" = "x1" ; then - COND_SHARED_1="" - fi - - COND_SHARED_0="#" - if test "x$SHARED" = "x0" ; then - COND_SHARED_0="" - fi - - COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" ; then - COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="" - fi - - COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" ; then - COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="" - fi - - COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" ; then - COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="" - fi - - COND_MONOLITHIC_0_SHARED_0_USE_HTML_1="#" - if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_HTML" = "x1" ; then - COND_MONOLITHIC_0_SHARED_0_USE_HTML_1="" - fi - - COND_MONOLITHIC_0_SHARED_1_USE_HTML_1="#" - if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_HTML" = "x1" ; then - COND_MONOLITHIC_0_SHARED_1_USE_HTML_1="" - fi - - COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#" - if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then - COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="" - fi - - COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="#" - if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then - COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="" - fi - @@ -35381,8 +35366,10 @@ s,@COND_DEPS_TRACKING_1@,$COND_DEPS_TRACKING_1,;t t s,@COND_MONOLITHIC_0@,$COND_MONOLITHIC_0,;t t s,@COND_MONOLITHIC_0_SHARED_0@,$COND_MONOLITHIC_0_SHARED_0,;t t s,@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@,$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1,;t t +s,@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@,$COND_MONOLITHIC_0_SHARED_0_USE_HTML_1,;t t s,@COND_MONOLITHIC_0_SHARED_1@,$COND_MONOLITHIC_0_SHARED_1,;t t s,@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@,$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1,;t t +s,@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@,$COND_MONOLITHIC_0_SHARED_1_USE_HTML_1,;t t s,@COND_MONOLITHIC_1@,$COND_MONOLITHIC_1,;t t s,@COND_MONOLITHIC_1_SHARED_0@,$COND_MONOLITHIC_1_SHARED_0,;t t s,@COND_MONOLITHIC_1_SHARED_1@,$COND_MONOLITHIC_1_SHARED_1,;t t @@ -35390,10 +35377,15 @@ s,@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@,$COND_OFFICIAL_BUILD_0_PLATFORM_WIN32 s,@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@,$COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1,;t t s,@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@,$COND_PLATFORM_MACOSX_0_USE_SOVERSION_1,;t t s,@COND_PLATFORM_MACOSX_1@,$COND_PLATFORM_MACOSX_1,;t t +s,@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@,$COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA,;t t +s,@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@,$COND_PLATFORM_MACOSX_1_TOOLKIT_GTK,;t t +s,@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@,$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC,;t t s,@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@,$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1,;t t s,@COND_PLATFORM_UNIX_1@,$COND_PLATFORM_UNIX_1,;t t s,@COND_PLATFORM_WIN32_0@,$COND_PLATFORM_WIN32_0,;t t s,@COND_PLATFORM_WIN32_1@,$COND_PLATFORM_WIN32_1,;t t +s,@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@,$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1,;t t +s,@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@,$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1,;t t s,@COND_TOOLKIT_COCOA@,$COND_TOOLKIT_COCOA,;t t s,@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0,;t t s,@COND_TOOLKIT_GTK@,$COND_TOOLKIT_GTK,;t t @@ -35433,16 +35425,6 @@ s,@COND_WXUSE_LIBTIFF_BUILTIN@,$COND_WXUSE_LIBTIFF_BUILTIN,;t t s,@COND_WXUSE_ODBC_BUILTIN@,$COND_WXUSE_ODBC_BUILTIN,;t t s,@COND_WXUSE_REGEX_BUILTIN@,$COND_WXUSE_REGEX_BUILTIN,;t t s,@COND_WXUSE_ZLIB_BUILTIN@,$COND_WXUSE_ZLIB_BUILTIN,;t t -s,@COND_PLATFORM_MAC_1@,$COND_PLATFORM_MAC_1,;t t -s,@COND_SHARED_1@,$COND_SHARED_1,;t t -s,@COND_SHARED_0@,$COND_SHARED_0,;t t -s,@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@,$COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA,;t t -s,@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@,$COND_PLATFORM_MACOSX_1_TOOLKIT_GTK,;t t -s,@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@,$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC,;t t -s,@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@,$COND_MONOLITHIC_0_SHARED_0_USE_HTML_1,;t t -s,@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@,$COND_MONOLITHIC_0_SHARED_1_USE_HTML_1,;t t -s,@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@,$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1,;t t -s,@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@,$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1,;t t s,@LEX_STEM@,$LEX_STEM,;t t s,@PATH_IFS@,$PATH_IFS,;t t s,@WX_MAJOR_VERSION_NUMBER@,$WX_MAJOR_VERSION_NUMBER,;t t diff --git a/contrib/build/animate/makefile.bcc b/contrib/build/animate/makefile.bcc new file mode 100644 index 0000000000..36571f4bb0 --- /dev/null +++ b/contrib/build/animate/makefile.bcc @@ -0,0 +1,168 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include \ + -I..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I..\..\src\animate\..\..\..\src\tiff \ + -I..\..\src\animate\..\..\..\src\jpeg \ + -I..\..\src\animate\..\..\..\src\png \ + -I..\..\src\animate\..\..\..\src\zlib \ + -I..\..\src\animate\..\..\..\src\regex -I..\..\src\animate\..\..\include \ + -DWXUSINGDLL -DWXMAKINGDLL_ANIMATE $(CXXFLAGS) -Hu \ + -H=$(OBJS)\wxprec_animatedll.csm +ANIMATELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include \ + -I..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I..\..\src\animate\..\..\..\src\tiff \ + -I..\..\src\animate\..\..\..\src\jpeg \ + -I..\..\src\animate\..\..\..\src\png \ + -I..\..\src\animate\..\..\..\src\zlib \ + -I..\..\src\animate\..\..\..\src\regex -I..\..\src\animate\..\..\include \ + $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_animatelib.csm +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(OFFICIAL_BUILD)" == "0" +VENDORTAG = _$(VENDOR) +!endif +!if "$(OFFICIAL_BUILD)" == "1" +VENDORTAG = +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(SHARED)" == "1" +__animatedll___depname = \ + ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll +!endif +!if "$(SHARED)" == "0" +__animatelib___depname = \ + ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__animatedll___depname) $(__animatelib___depname) + +$(OBJS)\animatedll_animate.obj: ../../src/animate\animate.cpp + $(CXX) -q -c -P -o$@ $(ANIMATEDLL_CXXFLAGS) $** + +$(OBJS)\animatedll_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(ANIMATEDLL_CXXFLAGS) -H $** + +$(OBJS)\animatelib_animate.obj: ../../src/animate\animate.cpp + $(CXX) -q -c -P -o$@ $(ANIMATELIB_CXXFLAGS) $** + +$(OBJS)\animatelib_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(ANIMATELIB_CXXFLAGS) -H $** + +!if "$(SHARED)" == "1" +..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll: $(OBJS)\animatedll_dummy.obj $(OBJS)\animatedll_dummy.obj $(OBJS)\animatedll_animate.obj + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| + c0d32.obj $(OBJS)\animatedll_dummy.obj $(OBJS)\animatedll_animate.obj,$@,, $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,, +| + implib -f ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate $@ +!endif + +!if "$(SHARED)" == "0" +..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib: $(OBJS)\animatelib_dummy.obj $(OBJS)\animatelib_dummy.obj $(OBJS)\animatelib_animate.obj + if exist $@ del $@ + tlib /a /p2048 $@ @&&| + $(OBJS)\animatelib_dummy.obj $(OBJS)\animatelib_animate.obj +| +!endif + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll del ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll + -if exist ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib + -if exist ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del ..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib diff --git a/contrib/build/animate/makefile.gcc b/contrib/build/animate/makefile.gcc new file mode 100644 index 0000000000..cc2829077b --- /dev/null +++ b/contrib/build/animate/makefile.gcc @@ -0,0 +1,124 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I..\..\src\animate\..\..\..\src\tiff -I..\..\src\animate\..\..\..\src\jpeg -I..\..\src\animate\..\..\..\src\png -I..\..\src\animate\..\..\..\src\zlib -I..\..\src\animate\..\..\..\src\regex -I..\..\src\animate\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_ANIMATE $(CXXFLAGS) +ANIMATELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I..\..\src\animate\..\..\..\src\tiff -I..\..\src\animate\..\..\..\src\jpeg -I..\..\src\animate\..\..\..\src\png -I..\..\src\animate\..\..\..\src\zlib -I..\..\src\animate\..\..\..\src\regex -I..\..\src\animate\..\..\include $(CXXFLAGS) +OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(OFFICIAL_BUILD),0) +VENDORTAG = _$(VENDOR) +endif +ifeq ($(OFFICIAL_BUILD),1) +VENDORTAG = +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(SHARED),1) +__animatedll___depname = ..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_gcc$(VENDORTAG).dll +endif +ifeq ($(SHARED),0) +__animatelib___depname = ..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__animatedll___depname) $(__animatelib___depname) + +$(OBJS)\animatedll_animate.o: ../../src/animate\animate.cpp + $(CXX) -c -o $@ $(ANIMATEDLL_CXXFLAGS) $< + +$(OBJS)\animatedll_dummy.o: ../../src/animate\..\..\..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(ANIMATEDLL_CXXFLAGS) $< + +$(OBJS)\animatelib_animate.o: ../../src/animate\animate.cpp + $(CXX) -c -o $@ $(ANIMATELIB_CXXFLAGS) $< + +$(OBJS)\animatelib_dummy.o: ../../src/animate\..\..\..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(ANIMATELIB_CXXFLAGS) $< + +ifeq ($(SHARED),1) +..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_gcc$(VENDORTAG).dll: $(OBJS)\animatedll_dummy.o $(OBJS)\animatedll_animate.o + $(CXX) -shared -o $@ $(OBJS)\animatedll_dummy.o $(OBJS)\animatedll_animate.o $(LDFLAGS) -Wl,--out-implib,..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a $(__DEBUGFLAG) -mthreads -L..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) +endif + +ifeq ($(SHARED),0) +..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a: $(OBJS)\animatelib_dummy.o $(OBJS)\animatelib_animate.o + if exist $@ del $@ + ar rcu $@ $(OBJS)\animatelib_dummy.o $(OBJS)\animatelib_animate.o + ranlib $@ +endif + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist ..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_gcc$(VENDORTAG).dll del ..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_gcc$(VENDORTAG).dll + -if exist ..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a del ..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a + -if exist ..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a del ..\..\src\animate\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a + +.PHONY: all clean diff --git a/contrib/build/animate/makefile.vc b/contrib/build/animate/makefile.vc new file mode 100644 index 0000000000..b8d47b0e17 --- /dev/null +++ b/contrib/build/animate/makefile.vc @@ -0,0 +1,141 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) $(__DEBUGFLAG) /Fd..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).pdb $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\animate\..\..\..\include /I..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\animate\..\..\..\src\tiff /I..\..\src\animate\..\..\..\src\jpeg /I..\..\src\animate\..\..\..\src\png /I..\..\src\animate\..\..\..\src\zlib /I..\..\src\animate\..\..\..\src\regex /Fp$(OBJS)\wxprec_animatedll.pch /I..\..\src\animate\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_ANIMATE $(CXXFLAGS) /Yuwx/wxprec.h +ANIMATELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) $(__DEBUGFLAG) /Fd..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.pdb $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\animate\..\..\..\include /I..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\animate\..\..\..\src\tiff /I..\..\src\animate\..\..\..\src\jpeg /I..\..\src\animate\..\..\..\src\png /I..\..\src\animate\..\..\..\src\zlib /I..\..\src\animate\..\..\..\src\regex /Fp$(OBJS)\wxprec_animatelib.pch /I..\..\src\animate\..\..\include $(CXXFLAGS) /Yuwx/wxprec.h +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(OFFICIAL_BUILD)" == "0" +VENDORTAG = _$(VENDOR) +!endif +!if "$(OFFICIAL_BUILD)" == "1" +VENDORTAG = +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_3 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_3 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(SHARED)" == "1" +__animatedll___depname = ..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).dll +!endif +!if "$(SHARED)" == "0" +__animatelib___depname = ..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__animatedll___depname) $(__animatelib___depname) + +$(OBJS)\animatedll_animate.obj: ../../src/animate\animate.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ANIMATEDLL_CXXFLAGS) $** + +$(OBJS)\animatedll_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ANIMATEDLL_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\animatelib_animate.obj: ../../src/animate\animate.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ANIMATELIB_CXXFLAGS) $** + +$(OBJS)\animatelib_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ANIMATELIB_CXXFLAGS) /Ycwx/wxprec.h $** + +!if "$(SHARED)" == "1" +..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).dll: $(OBJS)\animatedll_dummy.obj $(OBJS)\animatedll_dummy.obj $(OBJS)\animatedll_animate.obj + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @<< + $(OBJS)\animatedll_dummy.obj $(OBJS)\animatedll_animate.obj $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib +<< +!endif + +!if "$(SHARED)" == "0" +..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib: $(OBJS)\animatelib_dummy.obj $(OBJS)\animatelib_dummy.obj $(OBJS)\animatelib_animate.obj + if exist $@ del $@ + lib /NOLOGO /OUT:$@ @<< + $(OBJS)\animatelib_dummy.obj $(OBJS)\animatelib_animate.obj +<< +!endif + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist ..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).dll del ..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).dll + -if exist ..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del ..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib + -if exist ..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del ..\..\src\animate\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib diff --git a/contrib/build/animate/makefile.wat b/contrib/build/animate/makefile.wat new file mode 100644 index 0000000000..329df1e2b6 --- /dev/null +++ b/contrib/build/animate/makefile.wat @@ -0,0 +1,178 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +VENDORTAG = +!ifeq OFFICIAL_BUILD 0 +VENDORTAG = _$(VENDOR) +!endif +!ifeq OFFICIAL_BUILD 1 +VENDORTAG = +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG = +!ifeq BUILD debug +__DEBUGFLAG = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__OPTIMIZEFLAG = +!ifeq BUILD debug +__OPTIMIZEFLAG = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG = -ot -ox +!endif +__RUNTIME_LIBS = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__animatedll___depname = +!ifeq SHARED 1 +__animatedll___depname = ..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll +!endif +__animatelib___depname = +!ifeq SHARED 0 +__animatelib___depname = ..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib +!endif + +### Variables: ### + +ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_animatedll.pch -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\animate\..\..\..\include -i=..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\animate\..\..\..\src\tiff -i=..\..\src\animate\..\..\..\src\jpeg -i=..\..\src\animate\..\..\..\src\png -i=..\..\src\animate\..\..\..\src\zlib -i=..\..\src\animate\..\..\..\src\regex -i=..\..\src\animate\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_ANIMATE $(CXXFLAGS) +ANIMATELIB_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_animatelib.pch $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\animate\..\..\..\include -i=..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\animate\..\..\..\src\tiff -i=..\..\src\animate\..\..\..\src\jpeg -i=..\..\src\animate\..\..\..\src\png -i=..\..\src\animate\..\..\..\src\zlib -i=..\..\src\animate\..\..\..\src\regex -i=..\..\src\animate\..\..\include $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(__animatedll___depname) $(__animatelib___depname) + +$(OBJS)\animatedll_animate.obj : .AUTODEPEND ../../src/animate\animate.cpp + $(CXX) -zq -fo=$^@ $(ANIMATEDLL_CXXFLAGS) $< + +$(OBJS)\animatedll_dummy.obj : .AUTODEPEND ../../src/animate\..\..\..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(ANIMATEDLL_CXXFLAGS) $< + +$(OBJS)\animatelib_animate.obj : .AUTODEPEND ../../src/animate\animate.cpp + $(CXX) -zq -fo=$^@ $(ANIMATELIB_CXXFLAGS) $< + +$(OBJS)\animatelib_dummy.obj : .AUTODEPEND ../../src/animate\..\..\..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(ANIMATELIB_CXXFLAGS) $< + +!ifeq SHARED 1 +..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll : $(OBJS)\animatedll_dummy.obj $(OBJS)\animatedll_animate.obj + @%create $(OBJS)\animatedll.lbc + @%append $(OBJS)\animatedll.lbc option quiet + @%append $(OBJS)\animatedll.lbc name $^@ + @%append $(OBJS)\animatedll.lbc option incremental + @%append $(OBJS)\animatedll.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath ..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + @for %i in ( $(OBJS)\animatedll_dummy.obj $(OBJS)\animatedll_animate.obj) do @%append $(OBJS)\animatedll.lbc file %i + @for %i in ( $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\animatedll.lbc library %i + @%append $(OBJS)\animatedll.lbc + @%append $(OBJS)\animatedll.lbc system nt_dll + wlink @$(OBJS)\animatedll.lbc + wlib -q -n -b ..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib +$^@ +!endif + +!ifeq SHARED 0 +..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib : $(OBJS)\animatelib_dummy.obj $(OBJS)\animatelib_animate.obj + @%create $(OBJS)\animatelib.lbc + @for %i in ( $(OBJS)\animatelib_dummy.obj $(OBJS)\animatelib_animate.obj) do @%append $(OBJS)\animatelib.lbc +%i + wlib -q -p2048 -n -b $^@ @$(OBJS)\animatelib.lbc +!endif + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist ..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll del ..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_wat$(VENDORTAG).dll + -if exist ..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del ..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib + -if exist ..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib del ..\..\src\animate\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib diff --git a/contrib/build/fl/makefile.bcc b/contrib/build/fl/makefile.bcc new file mode 100644 index 0000000000..dfbe53bfb3 --- /dev/null +++ b/contrib/build/fl/makefile.bcc @@ -0,0 +1,259 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +FLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \ + -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include \ + -I..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I..\..\src\fl\..\..\..\src\tiff -I..\..\src\fl\..\..\..\src\jpeg \ + -I..\..\src\fl\..\..\..\src\png -I..\..\src\fl\..\..\..\src\zlib \ + -I..\..\src\fl\..\..\..\src\regex -I..\..\src\fl\..\..\include \ + -DWXUSINGDLL -DWXMAKINGDLL_FL $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_fldll.csm +FLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \ + -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include \ + -I..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I..\..\src\fl\..\..\..\src\tiff -I..\..\src\fl\..\..\..\src\jpeg \ + -I..\..\src\fl\..\..\..\src\png -I..\..\src\fl\..\..\..\src\zlib \ + -I..\..\src\fl\..\..\..\src\regex -I..\..\src\fl\..\..\include $(CXXFLAGS) \ + -Hu -H=$(OBJS)\wxprec_fllib.csm +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(OFFICIAL_BUILD)" == "0" +VENDORTAG = _$(VENDOR) +!endif +!if "$(OFFICIAL_BUILD)" == "1" +VENDORTAG = +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(SHARED)" == "1" +__fldll___depname = \ + ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll +!endif +!if "$(SHARED)" == "0" +__fllib___depname = \ + ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__fldll___depname) $(__fllib___depname) + +$(OBJS)\fldll_antiflickpl.obj: ../../src/fl\antiflickpl.cpp + $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_bardragpl.obj: ../../src/fl\bardragpl.cpp + $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_barhintspl.obj: ../../src/fl\barhintspl.cpp + $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_cbcustom.obj: ../../src/fl\cbcustom.cpp + $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_controlbar.obj: ../../src/fl\controlbar.cpp + $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) -H $** + +$(OBJS)\fldll_dyntbar.obj: ../../src/fl\dyntbar.cpp + $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_dyntbarhnd.obj: ../../src/fl\dyntbarhnd.cpp + $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_frmview.obj: ../../src/fl\frmview.cpp + $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_garbagec.obj: ../../src/fl\garbagec.cpp + $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_gcupdatesmgr.obj: ../../src/fl\gcupdatesmgr.cpp + $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_hintanimpl.obj: ../../src/fl\hintanimpl.cpp + $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_newbmpbtn.obj: ../../src/fl\newbmpbtn.cpp + $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_panedrawpl.obj: ../../src/fl\panedrawpl.cpp + $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_rowdragpl.obj: ../../src/fl\rowdragpl.cpp + $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_rowlayoutpl.obj: ../../src/fl\rowlayoutpl.cpp + $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_toolwnd.obj: ../../src/fl\toolwnd.cpp + $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_updatesmgr.obj: ../../src/fl\updatesmgr.cpp + $(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fllib_antiflickpl.obj: ../../src/fl\antiflickpl.cpp + $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_bardragpl.obj: ../../src/fl\bardragpl.cpp + $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_barhintspl.obj: ../../src/fl\barhintspl.cpp + $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_cbcustom.obj: ../../src/fl\cbcustom.cpp + $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_controlbar.obj: ../../src/fl\controlbar.cpp + $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) -H $** + +$(OBJS)\fllib_dyntbar.obj: ../../src/fl\dyntbar.cpp + $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_dyntbarhnd.obj: ../../src/fl\dyntbarhnd.cpp + $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_frmview.obj: ../../src/fl\frmview.cpp + $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_garbagec.obj: ../../src/fl\garbagec.cpp + $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_gcupdatesmgr.obj: ../../src/fl\gcupdatesmgr.cpp + $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_hintanimpl.obj: ../../src/fl\hintanimpl.cpp + $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_newbmpbtn.obj: ../../src/fl\newbmpbtn.cpp + $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_panedrawpl.obj: ../../src/fl\panedrawpl.cpp + $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_rowdragpl.obj: ../../src/fl\rowdragpl.cpp + $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_rowlayoutpl.obj: ../../src/fl\rowlayoutpl.cpp + $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_toolwnd.obj: ../../src/fl\toolwnd.cpp + $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_updatesmgr.obj: ../../src/fl\updatesmgr.cpp + $(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll del ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll + -if exist ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib + -if exist ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib + +!if "$(SHARED)" == "1" +..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll: $(OBJS)\fldll_dummy.obj $(OBJS)\fldll_dummy.obj $(OBJS)\fldll_antiflickpl.obj $(OBJS)\fldll_bardragpl.obj $(OBJS)\fldll_barhintspl.obj $(OBJS)\fldll_cbcustom.obj $(OBJS)\fldll_controlbar.obj $(OBJS)\fldll_dyntbar.obj $(OBJS)\fldll_dyntbarhnd.obj $(OBJS)\fldll_frmview.obj $(OBJS)\fldll_garbagec.obj $(OBJS)\fldll_gcupdatesmgr.obj $(OBJS)\fldll_hintanimpl.obj $(OBJS)\fldll_newbmpbtn.obj $(OBJS)\fldll_panedrawpl.obj $(OBJS)\fldll_rowdragpl.obj $(OBJS)\fldll_rowlayoutpl.obj $(OBJS)\fldll_toolwnd.obj $(OBJS)\fldll_updatesmgr.obj + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| + c0d32.obj $(OBJS)\fldll_dummy.obj $(OBJS)\fldll_antiflickpl.obj $(OBJS)\fldll_bardragpl.obj $(OBJS)\fldll_barhintspl.obj $(OBJS)\fldll_cbcustom.obj $(OBJS)\fldll_controlbar.obj $(OBJS)\fldll_dyntbar.obj $(OBJS)\fldll_dyntbarhnd.obj $(OBJS)\fldll_frmview.obj $(OBJS)\fldll_garbagec.obj $(OBJS)\fldll_gcupdatesmgr.obj $(OBJS)\fldll_hintanimpl.obj $(OBJS)\fldll_newbmpbtn.obj $(OBJS)\fldll_panedrawpl.obj $(OBJS)\fldll_rowdragpl.obj $(OBJS)\fldll_rowlayoutpl.obj $(OBJS)\fldll_toolwnd.obj $(OBJS)\fldll_updatesmgr.obj,$@,, $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,, +| + implib -f ..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl $@ +!endif + +!if "$(SHARED)" == "0" +..\..\src\fl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib: $(OBJS)\fllib_dummy.obj $(OBJS)\fllib_dummy.obj $(OBJS)\fllib_antiflickpl.obj $(OBJS)\fllib_bardragpl.obj $(OBJS)\fllib_barhintspl.obj $(OBJS)\fllib_cbcustom.obj $(OBJS)\fllib_controlbar.obj $(OBJS)\fllib_dyntbar.obj $(OBJS)\fllib_dyntbarhnd.obj $(OBJS)\fllib_frmview.obj $(OBJS)\fllib_garbagec.obj $(OBJS)\fllib_gcupdatesmgr.obj $(OBJS)\fllib_hintanimpl.obj $(OBJS)\fllib_newbmpbtn.obj $(OBJS)\fllib_panedrawpl.obj $(OBJS)\fllib_rowdragpl.obj $(OBJS)\fllib_rowlayoutpl.obj $(OBJS)\fllib_toolwnd.obj $(OBJS)\fllib_updatesmgr.obj + if exist $@ del $@ + tlib /a /p2048 $@ @&&| + $(OBJS)\fllib_dummy.obj $(OBJS)\fllib_antiflickpl.obj $(OBJS)\fllib_bardragpl.obj $(OBJS)\fllib_barhintspl.obj $(OBJS)\fllib_cbcustom.obj $(OBJS)\fllib_controlbar.obj $(OBJS)\fllib_dyntbar.obj $(OBJS)\fllib_dyntbarhnd.obj $(OBJS)\fllib_frmview.obj $(OBJS)\fllib_garbagec.obj $(OBJS)\fllib_gcupdatesmgr.obj $(OBJS)\fllib_hintanimpl.obj $(OBJS)\fllib_newbmpbtn.obj $(OBJS)\fllib_panedrawpl.obj $(OBJS)\fllib_rowdragpl.obj $(OBJS)\fllib_rowlayoutpl.obj $(OBJS)\fllib_toolwnd.obj $(OBJS)\fllib_updatesmgr.obj +| +!endif diff --git a/contrib/build/fl/makefile.gcc b/contrib/build/fl/makefile.gcc new file mode 100644 index 0000000000..0b9a8f447a --- /dev/null +++ b/contrib/build/fl/makefile.gcc @@ -0,0 +1,220 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +FLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include -I..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I..\..\src\fl\..\..\..\src\tiff -I..\..\src\fl\..\..\..\src\jpeg -I..\..\src\fl\..\..\..\src\png -I..\..\src\fl\..\..\..\src\zlib -I..\..\src\fl\..\..\..\src\regex -I..\..\src\fl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FL $(CXXFLAGS) +FLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\fl\..\..\..\include -I..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I..\..\src\fl\..\..\..\src\tiff -I..\..\src\fl\..\..\..\src\jpeg -I..\..\src\fl\..\..\..\src\png -I..\..\src\fl\..\..\..\src\zlib -I..\..\src\fl\..\..\..\src\regex -I..\..\src\fl\..\..\include $(CXXFLAGS) +OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(OFFICIAL_BUILD),0) +VENDORTAG = _$(VENDOR) +endif +ifeq ($(OFFICIAL_BUILD),1) +VENDORTAG = +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(SHARED),1) +__fldll___depname = ..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll +endif +ifeq ($(SHARED),0) +__fllib___depname = ..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__fldll___depname) $(__fllib___depname) + +$(OBJS)\fldll_antiflickpl.o: ../../src/fl\antiflickpl.cpp + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_bardragpl.o: ../../src/fl\bardragpl.cpp + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_barhintspl.o: ../../src/fl\barhintspl.cpp + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_cbcustom.o: ../../src/fl\cbcustom.cpp + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_controlbar.o: ../../src/fl\controlbar.cpp + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_dummy.o: ../../src/fl\..\..\..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_dyntbar.o: ../../src/fl\dyntbar.cpp + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_dyntbarhnd.o: ../../src/fl\dyntbarhnd.cpp + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_frmview.o: ../../src/fl\frmview.cpp + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_garbagec.o: ../../src/fl\garbagec.cpp + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_gcupdatesmgr.o: ../../src/fl\gcupdatesmgr.cpp + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_hintanimpl.o: ../../src/fl\hintanimpl.cpp + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_newbmpbtn.o: ../../src/fl\newbmpbtn.cpp + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_panedrawpl.o: ../../src/fl\panedrawpl.cpp + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_rowdragpl.o: ../../src/fl\rowdragpl.cpp + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_rowlayoutpl.o: ../../src/fl\rowlayoutpl.cpp + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_toolwnd.o: ../../src/fl\toolwnd.cpp + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_updatesmgr.o: ../../src/fl\updatesmgr.cpp + $(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fllib_antiflickpl.o: ../../src/fl\antiflickpl.cpp + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_bardragpl.o: ../../src/fl\bardragpl.cpp + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_barhintspl.o: ../../src/fl\barhintspl.cpp + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_cbcustom.o: ../../src/fl\cbcustom.cpp + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_controlbar.o: ../../src/fl\controlbar.cpp + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_dummy.o: ../../src/fl\..\..\..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_dyntbar.o: ../../src/fl\dyntbar.cpp + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_dyntbarhnd.o: ../../src/fl\dyntbarhnd.cpp + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_frmview.o: ../../src/fl\frmview.cpp + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_garbagec.o: ../../src/fl\garbagec.cpp + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_gcupdatesmgr.o: ../../src/fl\gcupdatesmgr.cpp + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_hintanimpl.o: ../../src/fl\hintanimpl.cpp + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_newbmpbtn.o: ../../src/fl\newbmpbtn.cpp + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_panedrawpl.o: ../../src/fl\panedrawpl.cpp + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_rowdragpl.o: ../../src/fl\rowdragpl.cpp + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_rowlayoutpl.o: ../../src/fl\rowlayoutpl.cpp + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_toolwnd.o: ../../src/fl\toolwnd.cpp + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_updatesmgr.o: ../../src/fl\updatesmgr.cpp + $(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $< + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist ..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll del ..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll + -if exist ..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a del ..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a + -if exist ..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a del ..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a + +ifeq ($(SHARED),1) +..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll: $(OBJS)\fldll_dummy.o $(OBJS)\fldll_antiflickpl.o $(OBJS)\fldll_bardragpl.o $(OBJS)\fldll_barhintspl.o $(OBJS)\fldll_cbcustom.o $(OBJS)\fldll_controlbar.o $(OBJS)\fldll_dyntbar.o $(OBJS)\fldll_dyntbarhnd.o $(OBJS)\fldll_frmview.o $(OBJS)\fldll_garbagec.o $(OBJS)\fldll_gcupdatesmgr.o $(OBJS)\fldll_hintanimpl.o $(OBJS)\fldll_newbmpbtn.o $(OBJS)\fldll_panedrawpl.o $(OBJS)\fldll_rowdragpl.o $(OBJS)\fldll_rowlayoutpl.o $(OBJS)\fldll_toolwnd.o $(OBJS)\fldll_updatesmgr.o + $(CXX) -shared -o $@ $(OBJS)\fldll_dummy.o $(OBJS)\fldll_antiflickpl.o $(OBJS)\fldll_bardragpl.o $(OBJS)\fldll_barhintspl.o $(OBJS)\fldll_cbcustom.o $(OBJS)\fldll_controlbar.o $(OBJS)\fldll_dyntbar.o $(OBJS)\fldll_dyntbarhnd.o $(OBJS)\fldll_frmview.o $(OBJS)\fldll_garbagec.o $(OBJS)\fldll_gcupdatesmgr.o $(OBJS)\fldll_hintanimpl.o $(OBJS)\fldll_newbmpbtn.o $(OBJS)\fldll_panedrawpl.o $(OBJS)\fldll_rowdragpl.o $(OBJS)\fldll_rowlayoutpl.o $(OBJS)\fldll_toolwnd.o $(OBJS)\fldll_updatesmgr.o $(LDFLAGS) -Wl,--out-implib,..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a $(__DEBUGFLAG) -mthreads -L..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) +endif + +ifeq ($(SHARED),0) +..\..\src\fl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a: $(OBJS)\fllib_dummy.o $(OBJS)\fllib_antiflickpl.o $(OBJS)\fllib_bardragpl.o $(OBJS)\fllib_barhintspl.o $(OBJS)\fllib_cbcustom.o $(OBJS)\fllib_controlbar.o $(OBJS)\fllib_dyntbar.o $(OBJS)\fllib_dyntbarhnd.o $(OBJS)\fllib_frmview.o $(OBJS)\fllib_garbagec.o $(OBJS)\fllib_gcupdatesmgr.o $(OBJS)\fllib_hintanimpl.o $(OBJS)\fllib_newbmpbtn.o $(OBJS)\fllib_panedrawpl.o $(OBJS)\fllib_rowdragpl.o $(OBJS)\fllib_rowlayoutpl.o $(OBJS)\fllib_toolwnd.o $(OBJS)\fllib_updatesmgr.o + if exist $@ del $@ + ar rcu $@ $(OBJS)\fllib_dummy.o $(OBJS)\fllib_antiflickpl.o $(OBJS)\fllib_bardragpl.o $(OBJS)\fllib_barhintspl.o $(OBJS)\fllib_cbcustom.o $(OBJS)\fllib_controlbar.o $(OBJS)\fllib_dyntbar.o $(OBJS)\fllib_dyntbarhnd.o $(OBJS)\fllib_frmview.o $(OBJS)\fllib_garbagec.o $(OBJS)\fllib_gcupdatesmgr.o $(OBJS)\fllib_hintanimpl.o $(OBJS)\fllib_newbmpbtn.o $(OBJS)\fllib_panedrawpl.o $(OBJS)\fllib_rowdragpl.o $(OBJS)\fllib_rowlayoutpl.o $(OBJS)\fllib_toolwnd.o $(OBJS)\fllib_updatesmgr.o + ranlib $@ +endif + +.PHONY: all clean diff --git a/contrib/build/fl/makefile.vc b/contrib/build/fl/makefile.vc new file mode 100644 index 0000000000..69f2bc51cb --- /dev/null +++ b/contrib/build/fl/makefile.vc @@ -0,0 +1,237 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +FLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) $(__DEBUGFLAG) /Fd..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).pdb $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\fl\..\..\..\include /I..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\fl\..\..\..\src\tiff /I..\..\src\fl\..\..\..\src\jpeg /I..\..\src\fl\..\..\..\src\png /I..\..\src\fl\..\..\..\src\zlib /I..\..\src\fl\..\..\..\src\regex /Fp$(OBJS)\wxprec_fldll.pch /I..\..\src\fl\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_FL $(CXXFLAGS) /Yuwx/wxprec.h +FLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) $(__DEBUGFLAG) /Fd..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.pdb $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\fl\..\..\..\include /I..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\fl\..\..\..\src\tiff /I..\..\src\fl\..\..\..\src\jpeg /I..\..\src\fl\..\..\..\src\png /I..\..\src\fl\..\..\..\src\zlib /I..\..\src\fl\..\..\..\src\regex /Fp$(OBJS)\wxprec_fllib.pch /I..\..\src\fl\..\..\include $(CXXFLAGS) /Yuwx/wxprec.h +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(OFFICIAL_BUILD)" == "0" +VENDORTAG = _$(VENDOR) +!endif +!if "$(OFFICIAL_BUILD)" == "1" +VENDORTAG = +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_3 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_3 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(SHARED)" == "1" +__fldll___depname = ..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll +!endif +!if "$(SHARED)" == "0" +__fllib___depname = ..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__fldll___depname) $(__fllib___depname) + +$(OBJS)\fldll_antiflickpl.obj: ../../src/fl\antiflickpl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_bardragpl.obj: ../../src/fl\bardragpl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_barhintspl.obj: ../../src/fl\barhintspl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_cbcustom.obj: ../../src/fl\cbcustom.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_controlbar.obj: ../../src/fl\controlbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\fldll_dyntbar.obj: ../../src/fl\dyntbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_dyntbarhnd.obj: ../../src/fl\dyntbarhnd.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_frmview.obj: ../../src/fl\frmview.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_garbagec.obj: ../../src/fl\garbagec.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_gcupdatesmgr.obj: ../../src/fl\gcupdatesmgr.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_hintanimpl.obj: ../../src/fl\hintanimpl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_newbmpbtn.obj: ../../src/fl\newbmpbtn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_panedrawpl.obj: ../../src/fl\panedrawpl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_rowdragpl.obj: ../../src/fl\rowdragpl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_rowlayoutpl.obj: ../../src/fl\rowlayoutpl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_toolwnd.obj: ../../src/fl\toolwnd.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fldll_updatesmgr.obj: ../../src/fl\updatesmgr.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $** + +$(OBJS)\fllib_antiflickpl.obj: ../../src/fl\antiflickpl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_bardragpl.obj: ../../src/fl\bardragpl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_barhintspl.obj: ../../src/fl\barhintspl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_cbcustom.obj: ../../src/fl\cbcustom.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_controlbar.obj: ../../src/fl\controlbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\fllib_dyntbar.obj: ../../src/fl\dyntbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_dyntbarhnd.obj: ../../src/fl\dyntbarhnd.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_frmview.obj: ../../src/fl\frmview.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_garbagec.obj: ../../src/fl\garbagec.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_gcupdatesmgr.obj: ../../src/fl\gcupdatesmgr.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_hintanimpl.obj: ../../src/fl\hintanimpl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_newbmpbtn.obj: ../../src/fl\newbmpbtn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_panedrawpl.obj: ../../src/fl\panedrawpl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_rowdragpl.obj: ../../src/fl\rowdragpl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_rowlayoutpl.obj: ../../src/fl\rowlayoutpl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_toolwnd.obj: ../../src/fl\toolwnd.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $** + +$(OBJS)\fllib_updatesmgr.obj: ../../src/fl\updatesmgr.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist ..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll del ..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll + -if exist ..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del ..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib + -if exist ..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del ..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib + +!if "$(SHARED)" == "1" +..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll: $(OBJS)\fldll_dummy.obj $(OBJS)\fldll_dummy.obj $(OBJS)\fldll_antiflickpl.obj $(OBJS)\fldll_bardragpl.obj $(OBJS)\fldll_barhintspl.obj $(OBJS)\fldll_cbcustom.obj $(OBJS)\fldll_controlbar.obj $(OBJS)\fldll_dyntbar.obj $(OBJS)\fldll_dyntbarhnd.obj $(OBJS)\fldll_frmview.obj $(OBJS)\fldll_garbagec.obj $(OBJS)\fldll_gcupdatesmgr.obj $(OBJS)\fldll_hintanimpl.obj $(OBJS)\fldll_newbmpbtn.obj $(OBJS)\fldll_panedrawpl.obj $(OBJS)\fldll_rowdragpl.obj $(OBJS)\fldll_rowlayoutpl.obj $(OBJS)\fldll_toolwnd.obj $(OBJS)\fldll_updatesmgr.obj + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @<< + $(OBJS)\fldll_dummy.obj $(OBJS)\fldll_antiflickpl.obj $(OBJS)\fldll_bardragpl.obj $(OBJS)\fldll_barhintspl.obj $(OBJS)\fldll_cbcustom.obj $(OBJS)\fldll_controlbar.obj $(OBJS)\fldll_dyntbar.obj $(OBJS)\fldll_dyntbarhnd.obj $(OBJS)\fldll_frmview.obj $(OBJS)\fldll_garbagec.obj $(OBJS)\fldll_gcupdatesmgr.obj $(OBJS)\fldll_hintanimpl.obj $(OBJS)\fldll_newbmpbtn.obj $(OBJS)\fldll_panedrawpl.obj $(OBJS)\fldll_rowdragpl.obj $(OBJS)\fldll_rowlayoutpl.obj $(OBJS)\fldll_toolwnd.obj $(OBJS)\fldll_updatesmgr.obj $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib +<< +!endif + +!if "$(SHARED)" == "0" +..\..\src\fl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib: $(OBJS)\fllib_dummy.obj $(OBJS)\fllib_dummy.obj $(OBJS)\fllib_antiflickpl.obj $(OBJS)\fllib_bardragpl.obj $(OBJS)\fllib_barhintspl.obj $(OBJS)\fllib_cbcustom.obj $(OBJS)\fllib_controlbar.obj $(OBJS)\fllib_dyntbar.obj $(OBJS)\fllib_dyntbarhnd.obj $(OBJS)\fllib_frmview.obj $(OBJS)\fllib_garbagec.obj $(OBJS)\fllib_gcupdatesmgr.obj $(OBJS)\fllib_hintanimpl.obj $(OBJS)\fllib_newbmpbtn.obj $(OBJS)\fllib_panedrawpl.obj $(OBJS)\fllib_rowdragpl.obj $(OBJS)\fllib_rowlayoutpl.obj $(OBJS)\fllib_toolwnd.obj $(OBJS)\fllib_updatesmgr.obj + if exist $@ del $@ + lib /NOLOGO /OUT:$@ @<< + $(OBJS)\fllib_dummy.obj $(OBJS)\fllib_antiflickpl.obj $(OBJS)\fllib_bardragpl.obj $(OBJS)\fllib_barhintspl.obj $(OBJS)\fllib_cbcustom.obj $(OBJS)\fllib_controlbar.obj $(OBJS)\fllib_dyntbar.obj $(OBJS)\fllib_dyntbarhnd.obj $(OBJS)\fllib_frmview.obj $(OBJS)\fllib_garbagec.obj $(OBJS)\fllib_gcupdatesmgr.obj $(OBJS)\fllib_hintanimpl.obj $(OBJS)\fllib_newbmpbtn.obj $(OBJS)\fllib_panedrawpl.obj $(OBJS)\fllib_rowdragpl.obj $(OBJS)\fllib_rowlayoutpl.obj $(OBJS)\fllib_toolwnd.obj $(OBJS)\fllib_updatesmgr.obj +<< +!endif diff --git a/contrib/build/fl/makefile.wat b/contrib/build/fl/makefile.wat new file mode 100644 index 0000000000..71d1871f07 --- /dev/null +++ b/contrib/build/fl/makefile.wat @@ -0,0 +1,274 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +VENDORTAG = +!ifeq OFFICIAL_BUILD 0 +VENDORTAG = _$(VENDOR) +!endif +!ifeq OFFICIAL_BUILD 1 +VENDORTAG = +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG = +!ifeq BUILD debug +__DEBUGFLAG = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__OPTIMIZEFLAG = +!ifeq BUILD debug +__OPTIMIZEFLAG = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG = -ot -ox +!endif +__RUNTIME_LIBS = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__fldll___depname = +!ifeq SHARED 1 +__fldll___depname = ..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_wat$(VENDORTAG).dll +!endif +__fllib___depname = +!ifeq SHARED 0 +__fllib___depname = ..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib +!endif + +### Variables: ### + +FLDLL_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_fldll.pch -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\fl\..\..\..\include -i=..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\fl\..\..\..\src\tiff -i=..\..\src\fl\..\..\..\src\jpeg -i=..\..\src\fl\..\..\..\src\png -i=..\..\src\fl\..\..\..\src\zlib -i=..\..\src\fl\..\..\..\src\regex -i=..\..\src\fl\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_FL $(CXXFLAGS) +FLLIB_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_fllib.pch $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\fl\..\..\..\include -i=..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\fl\..\..\..\src\tiff -i=..\..\src\fl\..\..\..\src\jpeg -i=..\..\src\fl\..\..\..\src\png -i=..\..\src\fl\..\..\..\src\zlib -i=..\..\src\fl\..\..\..\src\regex -i=..\..\src\fl\..\..\include $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(__fldll___depname) $(__fllib___depname) + +$(OBJS)\fldll_antiflickpl.obj : .AUTODEPEND ../../src/fl\antiflickpl.cpp + $(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_bardragpl.obj : .AUTODEPEND ../../src/fl\bardragpl.cpp + $(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_barhintspl.obj : .AUTODEPEND ../../src/fl\barhintspl.cpp + $(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_cbcustom.obj : .AUTODEPEND ../../src/fl\cbcustom.cpp + $(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_controlbar.obj : .AUTODEPEND ../../src/fl\controlbar.cpp + $(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_dummy.obj : .AUTODEPEND ../../src/fl\..\..\..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_dyntbar.obj : .AUTODEPEND ../../src/fl\dyntbar.cpp + $(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_dyntbarhnd.obj : .AUTODEPEND ../../src/fl\dyntbarhnd.cpp + $(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_frmview.obj : .AUTODEPEND ../../src/fl\frmview.cpp + $(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_garbagec.obj : .AUTODEPEND ../../src/fl\garbagec.cpp + $(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_gcupdatesmgr.obj : .AUTODEPEND ../../src/fl\gcupdatesmgr.cpp + $(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_hintanimpl.obj : .AUTODEPEND ../../src/fl\hintanimpl.cpp + $(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_newbmpbtn.obj : .AUTODEPEND ../../src/fl\newbmpbtn.cpp + $(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_panedrawpl.obj : .AUTODEPEND ../../src/fl\panedrawpl.cpp + $(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_rowdragpl.obj : .AUTODEPEND ../../src/fl\rowdragpl.cpp + $(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_rowlayoutpl.obj : .AUTODEPEND ../../src/fl\rowlayoutpl.cpp + $(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_toolwnd.obj : .AUTODEPEND ../../src/fl\toolwnd.cpp + $(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fldll_updatesmgr.obj : .AUTODEPEND ../../src/fl\updatesmgr.cpp + $(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $< + +$(OBJS)\fllib_antiflickpl.obj : .AUTODEPEND ../../src/fl\antiflickpl.cpp + $(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_bardragpl.obj : .AUTODEPEND ../../src/fl\bardragpl.cpp + $(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_barhintspl.obj : .AUTODEPEND ../../src/fl\barhintspl.cpp + $(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_cbcustom.obj : .AUTODEPEND ../../src/fl\cbcustom.cpp + $(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_controlbar.obj : .AUTODEPEND ../../src/fl\controlbar.cpp + $(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_dummy.obj : .AUTODEPEND ../../src/fl\..\..\..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_dyntbar.obj : .AUTODEPEND ../../src/fl\dyntbar.cpp + $(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_dyntbarhnd.obj : .AUTODEPEND ../../src/fl\dyntbarhnd.cpp + $(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_frmview.obj : .AUTODEPEND ../../src/fl\frmview.cpp + $(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_garbagec.obj : .AUTODEPEND ../../src/fl\garbagec.cpp + $(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_gcupdatesmgr.obj : .AUTODEPEND ../../src/fl\gcupdatesmgr.cpp + $(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_hintanimpl.obj : .AUTODEPEND ../../src/fl\hintanimpl.cpp + $(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_newbmpbtn.obj : .AUTODEPEND ../../src/fl\newbmpbtn.cpp + $(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_panedrawpl.obj : .AUTODEPEND ../../src/fl\panedrawpl.cpp + $(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_rowdragpl.obj : .AUTODEPEND ../../src/fl\rowdragpl.cpp + $(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_rowlayoutpl.obj : .AUTODEPEND ../../src/fl\rowlayoutpl.cpp + $(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_toolwnd.obj : .AUTODEPEND ../../src/fl\toolwnd.cpp + $(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + +$(OBJS)\fllib_updatesmgr.obj : .AUTODEPEND ../../src/fl\updatesmgr.cpp + $(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist ..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_wat$(VENDORTAG).dll del ..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_wat$(VENDORTAG).dll + -if exist ..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del ..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib + -if exist ..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib del ..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib + +!ifeq SHARED 1 +..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_wat$(VENDORTAG).dll : $(OBJS)\fldll_dummy.obj $(OBJS)\fldll_antiflickpl.obj $(OBJS)\fldll_bardragpl.obj $(OBJS)\fldll_barhintspl.obj $(OBJS)\fldll_cbcustom.obj $(OBJS)\fldll_controlbar.obj $(OBJS)\fldll_dyntbar.obj $(OBJS)\fldll_dyntbarhnd.obj $(OBJS)\fldll_frmview.obj $(OBJS)\fldll_garbagec.obj $(OBJS)\fldll_gcupdatesmgr.obj $(OBJS)\fldll_hintanimpl.obj $(OBJS)\fldll_newbmpbtn.obj $(OBJS)\fldll_panedrawpl.obj $(OBJS)\fldll_rowdragpl.obj $(OBJS)\fldll_rowlayoutpl.obj $(OBJS)\fldll_toolwnd.obj $(OBJS)\fldll_updatesmgr.obj + @%create $(OBJS)\fldll.lbc + @%append $(OBJS)\fldll.lbc option quiet + @%append $(OBJS)\fldll.lbc name $^@ + @%append $(OBJS)\fldll.lbc option incremental + @%append $(OBJS)\fldll.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath ..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + @for %i in ( $(OBJS)\fldll_dummy.obj $(OBJS)\fldll_antiflickpl.obj $(OBJS)\fldll_bardragpl.obj $(OBJS)\fldll_barhintspl.obj $(OBJS)\fldll_cbcustom.obj $(OBJS)\fldll_controlbar.obj $(OBJS)\fldll_dyntbar.obj $(OBJS)\fldll_dyntbarhnd.obj $(OBJS)\fldll_frmview.obj $(OBJS)\fldll_garbagec.obj $(OBJS)\fldll_gcupdatesmgr.obj $(OBJS)\fldll_hintanimpl.obj $(OBJS)\fldll_newbmpbtn.obj $(OBJS)\fldll_panedrawpl.obj $(OBJS)\fldll_rowdragpl.obj $(OBJS)\fldll_rowlayoutpl.obj $(OBJS)\fldll_toolwnd.obj $(OBJS)\fldll_updatesmgr.obj) do @%append $(OBJS)\fldll.lbc file %i + @for %i in ( $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\fldll.lbc library %i + @%append $(OBJS)\fldll.lbc + @%append $(OBJS)\fldll.lbc system nt_dll + wlink @$(OBJS)\fldll.lbc + wlib -q -n -b ..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib +$^@ +!endif + +!ifeq SHARED 0 +..\..\src\fl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib : $(OBJS)\fllib_dummy.obj $(OBJS)\fllib_antiflickpl.obj $(OBJS)\fllib_bardragpl.obj $(OBJS)\fllib_barhintspl.obj $(OBJS)\fllib_cbcustom.obj $(OBJS)\fllib_controlbar.obj $(OBJS)\fllib_dyntbar.obj $(OBJS)\fllib_dyntbarhnd.obj $(OBJS)\fllib_frmview.obj $(OBJS)\fllib_garbagec.obj $(OBJS)\fllib_gcupdatesmgr.obj $(OBJS)\fllib_hintanimpl.obj $(OBJS)\fllib_newbmpbtn.obj $(OBJS)\fllib_panedrawpl.obj $(OBJS)\fllib_rowdragpl.obj $(OBJS)\fllib_rowlayoutpl.obj $(OBJS)\fllib_toolwnd.obj $(OBJS)\fllib_updatesmgr.obj + @%create $(OBJS)\fllib.lbc + @for %i in ( $(OBJS)\fllib_dummy.obj $(OBJS)\fllib_antiflickpl.obj $(OBJS)\fllib_bardragpl.obj $(OBJS)\fllib_barhintspl.obj $(OBJS)\fllib_cbcustom.obj $(OBJS)\fllib_controlbar.obj $(OBJS)\fllib_dyntbar.obj $(OBJS)\fllib_dyntbarhnd.obj $(OBJS)\fllib_frmview.obj $(OBJS)\fllib_garbagec.obj $(OBJS)\fllib_gcupdatesmgr.obj $(OBJS)\fllib_hintanimpl.obj $(OBJS)\fllib_newbmpbtn.obj $(OBJS)\fllib_panedrawpl.obj $(OBJS)\fllib_rowdragpl.obj $(OBJS)\fllib_rowlayoutpl.obj $(OBJS)\fllib_toolwnd.obj $(OBJS)\fllib_updatesmgr.obj) do @%append $(OBJS)\fllib.lbc +%i + wlib -q -p2048 -n -b $^@ @$(OBJS)\fllib.lbc +!endif diff --git a/contrib/build/gizmos/makefile.bcc b/contrib/build/gizmos/makefile.bcc new file mode 100644 index 0000000000..763105b318 --- /dev/null +++ b/contrib/build/gizmos/makefile.bcc @@ -0,0 +1,194 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\gizmos\..\..\..\include \ + -I..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I..\..\src\gizmos\..\..\..\src\tiff -I..\..\src\gizmos\..\..\..\src\jpeg \ + -I..\..\src\gizmos\..\..\..\src\png -I..\..\src\gizmos\..\..\..\src\zlib \ + -I..\..\src\gizmos\..\..\..\src\regex -I..\..\src\gizmos\..\..\include \ + -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS $(CXXFLAGS) -Hu \ + -H=$(OBJS)\wxprec_gizmosdll.csm +GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\gizmos\..\..\..\include \ + -I..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I..\..\src\gizmos\..\..\..\src\tiff -I..\..\src\gizmos\..\..\..\src\jpeg \ + -I..\..\src\gizmos\..\..\..\src\png -I..\..\src\gizmos\..\..\..\src\zlib \ + -I..\..\src\gizmos\..\..\..\src\regex -I..\..\src\gizmos\..\..\include \ + $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_gizmoslib.csm +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(OFFICIAL_BUILD)" == "0" +VENDORTAG = _$(VENDOR) +!endif +!if "$(OFFICIAL_BUILD)" == "1" +VENDORTAG = +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(SHARED)" == "1" +__gizmosdll___depname = \ + ..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_bcc$(VENDORTAG).dll +!endif +!if "$(SHARED)" == "0" +__gizmoslib___depname = \ + ..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__gizmosdll___depname) $(__gizmoslib___depname) + +$(OBJS)\gizmosdll_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) -H $** + +$(OBJS)\gizmosdll_dynamicsash.obj: ../../src/gizmos\dynamicsash.cpp + $(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) $** + +$(OBJS)\gizmosdll_editlbox.obj: ../../src/gizmos\editlbox.cpp + $(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) $** + +$(OBJS)\gizmosdll_ledctrl.obj: ../../src/gizmos\ledctrl.cpp + $(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) $** + +$(OBJS)\gizmosdll_multicell.obj: ../../src/gizmos\multicell.cpp + $(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) $** + +$(OBJS)\gizmosdll_splittree.obj: ../../src/gizmos\splittree.cpp + $(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) $** + +$(OBJS)\gizmosdll_statpict.obj: ../../src/gizmos\statpict.cpp + $(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) $** + +$(OBJS)\gizmoslib_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) -H $** + +$(OBJS)\gizmoslib_dynamicsash.obj: ../../src/gizmos\dynamicsash.cpp + $(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) $** + +$(OBJS)\gizmoslib_editlbox.obj: ../../src/gizmos\editlbox.cpp + $(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) $** + +$(OBJS)\gizmoslib_ledctrl.obj: ../../src/gizmos\ledctrl.cpp + $(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) $** + +$(OBJS)\gizmoslib_multicell.obj: ../../src/gizmos\multicell.cpp + $(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) $** + +$(OBJS)\gizmoslib_splittree.obj: ../../src/gizmos\splittree.cpp + $(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) $** + +$(OBJS)\gizmoslib_statpict.obj: ../../src/gizmos\statpict.cpp + $(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist ..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_bcc$(VENDORTAG).dll del ..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_bcc$(VENDORTAG).dll + -if exist ..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del ..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib + -if exist ..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del ..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib + +!if "$(SHARED)" == "1" +..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_bcc$(VENDORTAG).dll: $(OBJS)\gizmosdll_dummy.obj $(OBJS)\gizmosdll_dummy.obj $(OBJS)\gizmosdll_dynamicsash.obj $(OBJS)\gizmosdll_editlbox.obj $(OBJS)\gizmosdll_ledctrl.obj $(OBJS)\gizmosdll_multicell.obj $(OBJS)\gizmosdll_splittree.obj $(OBJS)\gizmosdll_statpict.obj + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| + c0d32.obj $(OBJS)\gizmosdll_dummy.obj $(OBJS)\gizmosdll_dynamicsash.obj $(OBJS)\gizmosdll_editlbox.obj $(OBJS)\gizmosdll_ledctrl.obj $(OBJS)\gizmosdll_multicell.obj $(OBJS)\gizmosdll_splittree.obj $(OBJS)\gizmosdll_statpict.obj,$@,, $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_BASE_p) $(__WXLIB_CORE_p) cw32mt$(__RUNTIME_LIBS_7).lib,, +| + implib -f ..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos $@ +!endif + +!if "$(SHARED)" == "0" +..\..\src\gizmos\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib: $(OBJS)\gizmoslib_dummy.obj $(OBJS)\gizmoslib_dummy.obj $(OBJS)\gizmoslib_dynamicsash.obj $(OBJS)\gizmoslib_editlbox.obj $(OBJS)\gizmoslib_ledctrl.obj $(OBJS)\gizmoslib_multicell.obj $(OBJS)\gizmoslib_splittree.obj $(OBJS)\gizmoslib_statpict.obj + if exist $@ del $@ + tlib /a /p2048 $@ @&&| + $(OBJS)\gizmoslib_dummy.obj $(OBJS)\gizmoslib_dynamicsash.obj $(OBJS)\gizmoslib_editlbox.obj $(OBJS)\gizmoslib_ledctrl.obj $(OBJS)\gizmoslib_multicell.obj $(OBJS)\gizmoslib_splittree.obj $(OBJS)\gizmoslib_statpict.obj +| +!endif diff --git a/contrib/build/gizmos/makefile.gcc b/contrib/build/gizmos/makefile.gcc new file mode 100644 index 0000000000..ad2eb414b2 --- /dev/null +++ b/contrib/build/gizmos/makefile.gcc @@ -0,0 +1,154 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\gizmos\..\..\..\include -I..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I..\..\src\gizmos\..\..\..\src\tiff -I..\..\src\gizmos\..\..\..\src\jpeg -I..\..\src\gizmos\..\..\..\src\png -I..\..\src\gizmos\..\..\..\src\zlib -I..\..\src\gizmos\..\..\..\src\regex -I..\..\src\gizmos\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS $(CXXFLAGS) +GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\gizmos\..\..\..\include -I..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I..\..\src\gizmos\..\..\..\src\tiff -I..\..\src\gizmos\..\..\..\src\jpeg -I..\..\src\gizmos\..\..\..\src\png -I..\..\src\gizmos\..\..\..\src\zlib -I..\..\src\gizmos\..\..\..\src\regex -I..\..\src\gizmos\..\..\include $(CXXFLAGS) +OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(OFFICIAL_BUILD),0) +VENDORTAG = _$(VENDOR) +endif +ifeq ($(OFFICIAL_BUILD),1) +VENDORTAG = +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(SHARED),1) +__gizmosdll___depname = ..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll +endif +ifeq ($(SHARED),0) +__gizmoslib___depname = ..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__gizmosdll___depname) $(__gizmoslib___depname) + +$(OBJS)\gizmosdll_dummy.o: ../../src/gizmos\..\..\..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< + +$(OBJS)\gizmosdll_dynamicsash.o: ../../src/gizmos\dynamicsash.cpp + $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< + +$(OBJS)\gizmosdll_editlbox.o: ../../src/gizmos\editlbox.cpp + $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< + +$(OBJS)\gizmosdll_ledctrl.o: ../../src/gizmos\ledctrl.cpp + $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< + +$(OBJS)\gizmosdll_multicell.o: ../../src/gizmos\multicell.cpp + $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< + +$(OBJS)\gizmosdll_splittree.o: ../../src/gizmos\splittree.cpp + $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< + +$(OBJS)\gizmosdll_statpict.o: ../../src/gizmos\statpict.cpp + $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< + +$(OBJS)\gizmoslib_dummy.o: ../../src/gizmos\..\..\..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< + +$(OBJS)\gizmoslib_dynamicsash.o: ../../src/gizmos\dynamicsash.cpp + $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< + +$(OBJS)\gizmoslib_editlbox.o: ../../src/gizmos\editlbox.cpp + $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< + +$(OBJS)\gizmoslib_ledctrl.o: ../../src/gizmos\ledctrl.cpp + $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< + +$(OBJS)\gizmoslib_multicell.o: ../../src/gizmos\multicell.cpp + $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< + +$(OBJS)\gizmoslib_splittree.o: ../../src/gizmos\splittree.cpp + $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< + +$(OBJS)\gizmoslib_statpict.o: ../../src/gizmos\statpict.cpp + $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist ..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll del ..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll + -if exist ..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a del ..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a + -if exist ..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a del ..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a + +ifeq ($(SHARED),1) +..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll: $(OBJS)\gizmosdll_dummy.o $(OBJS)\gizmosdll_dynamicsash.o $(OBJS)\gizmosdll_editlbox.o $(OBJS)\gizmosdll_ledctrl.o $(OBJS)\gizmosdll_multicell.o $(OBJS)\gizmosdll_splittree.o $(OBJS)\gizmosdll_statpict.o + $(CXX) -shared -o $@ $(OBJS)\gizmosdll_dummy.o $(OBJS)\gizmosdll_dynamicsash.o $(OBJS)\gizmosdll_editlbox.o $(OBJS)\gizmosdll_ledctrl.o $(OBJS)\gizmosdll_multicell.o $(OBJS)\gizmosdll_splittree.o $(OBJS)\gizmosdll_statpict.o $(LDFLAGS) -Wl,--out-implib,..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a $(__DEBUGFLAG) -mthreads -L..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__WXLIB_BASE_p) $(__WXLIB_CORE_p) +endif + +ifeq ($(SHARED),0) +..\..\src\gizmos\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a: $(OBJS)\gizmoslib_dummy.o $(OBJS)\gizmoslib_dynamicsash.o $(OBJS)\gizmoslib_editlbox.o $(OBJS)\gizmoslib_ledctrl.o $(OBJS)\gizmoslib_multicell.o $(OBJS)\gizmoslib_splittree.o $(OBJS)\gizmoslib_statpict.o + if exist $@ del $@ + ar rcu $@ $(OBJS)\gizmoslib_dummy.o $(OBJS)\gizmoslib_dynamicsash.o $(OBJS)\gizmoslib_editlbox.o $(OBJS)\gizmoslib_ledctrl.o $(OBJS)\gizmoslib_multicell.o $(OBJS)\gizmoslib_splittree.o $(OBJS)\gizmoslib_statpict.o + ranlib $@ +endif + +.PHONY: all clean diff --git a/contrib/build/gizmos/makefile.vc b/contrib/build/gizmos/makefile.vc new file mode 100644 index 0000000000..c855786c87 --- /dev/null +++ b/contrib/build/gizmos/makefile.vc @@ -0,0 +1,171 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) $(__DEBUGFLAG) /Fd..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).pdb $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\gizmos\..\..\..\include /I..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\gizmos\..\..\..\src\tiff /I..\..\src\gizmos\..\..\..\src\jpeg /I..\..\src\gizmos\..\..\..\src\png /I..\..\src\gizmos\..\..\..\src\zlib /I..\..\src\gizmos\..\..\..\src\regex /Fp$(OBJS)\wxprec_gizmosdll.pch /I..\..\src\gizmos\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_GIZMOS $(CXXFLAGS) /Yuwx/wxprec.h +GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) $(__DEBUGFLAG) /Fd..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.pdb $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\gizmos\..\..\..\include /I..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\gizmos\..\..\..\src\tiff /I..\..\src\gizmos\..\..\..\src\jpeg /I..\..\src\gizmos\..\..\..\src\png /I..\..\src\gizmos\..\..\..\src\zlib /I..\..\src\gizmos\..\..\..\src\regex /Fp$(OBJS)\wxprec_gizmoslib.pch /I..\..\src\gizmos\..\..\include $(CXXFLAGS) /Yuwx/wxprec.h +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(OFFICIAL_BUILD)" == "0" +VENDORTAG = _$(VENDOR) +!endif +!if "$(OFFICIAL_BUILD)" == "1" +VENDORTAG = +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_3 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_3 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(SHARED)" == "1" +__gizmosdll___depname = ..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).dll +!endif +!if "$(SHARED)" == "0" +__gizmoslib___depname = ..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__gizmosdll___depname) $(__gizmoslib___depname) + +$(OBJS)\gizmosdll_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\gizmosdll_dynamicsash.obj: ../../src/gizmos\dynamicsash.cpp + $(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) $** + +$(OBJS)\gizmosdll_editlbox.obj: ../../src/gizmos\editlbox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) $** + +$(OBJS)\gizmosdll_ledctrl.obj: ../../src/gizmos\ledctrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) $** + +$(OBJS)\gizmosdll_multicell.obj: ../../src/gizmos\multicell.cpp + $(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) $** + +$(OBJS)\gizmosdll_splittree.obj: ../../src/gizmos\splittree.cpp + $(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) $** + +$(OBJS)\gizmosdll_statpict.obj: ../../src/gizmos\statpict.cpp + $(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) $** + +$(OBJS)\gizmoslib_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\gizmoslib_dynamicsash.obj: ../../src/gizmos\dynamicsash.cpp + $(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) $** + +$(OBJS)\gizmoslib_editlbox.obj: ../../src/gizmos\editlbox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) $** + +$(OBJS)\gizmoslib_ledctrl.obj: ../../src/gizmos\ledctrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) $** + +$(OBJS)\gizmoslib_multicell.obj: ../../src/gizmos\multicell.cpp + $(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) $** + +$(OBJS)\gizmoslib_splittree.obj: ../../src/gizmos\splittree.cpp + $(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) $** + +$(OBJS)\gizmoslib_statpict.obj: ../../src/gizmos\statpict.cpp + $(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist ..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).dll del ..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).dll + -if exist ..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del ..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib + -if exist ..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del ..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib + +!if "$(SHARED)" == "1" +..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).dll: $(OBJS)\gizmosdll_dummy.obj $(OBJS)\gizmosdll_dummy.obj $(OBJS)\gizmosdll_dynamicsash.obj $(OBJS)\gizmosdll_editlbox.obj $(OBJS)\gizmosdll_ledctrl.obj $(OBJS)\gizmosdll_multicell.obj $(OBJS)\gizmosdll_splittree.obj $(OBJS)\gizmosdll_statpict.obj + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @<< + $(OBJS)\gizmosdll_dummy.obj $(OBJS)\gizmosdll_dynamicsash.obj $(OBJS)\gizmosdll_editlbox.obj $(OBJS)\gizmosdll_ledctrl.obj $(OBJS)\gizmosdll_multicell.obj $(OBJS)\gizmosdll_splittree.obj $(OBJS)\gizmosdll_statpict.obj $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_BASE_p) $(__WXLIB_CORE_p) /IMPLIB:..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib +<< +!endif + +!if "$(SHARED)" == "0" +..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib: $(OBJS)\gizmoslib_dummy.obj $(OBJS)\gizmoslib_dummy.obj $(OBJS)\gizmoslib_dynamicsash.obj $(OBJS)\gizmoslib_editlbox.obj $(OBJS)\gizmoslib_ledctrl.obj $(OBJS)\gizmoslib_multicell.obj $(OBJS)\gizmoslib_splittree.obj $(OBJS)\gizmoslib_statpict.obj + if exist $@ del $@ + lib /NOLOGO /OUT:$@ @<< + $(OBJS)\gizmoslib_dummy.obj $(OBJS)\gizmoslib_dynamicsash.obj $(OBJS)\gizmoslib_editlbox.obj $(OBJS)\gizmoslib_ledctrl.obj $(OBJS)\gizmoslib_multicell.obj $(OBJS)\gizmoslib_splittree.obj $(OBJS)\gizmoslib_statpict.obj +<< +!endif diff --git a/contrib/build/gizmos/makefile.wat b/contrib/build/gizmos/makefile.wat new file mode 100644 index 0000000000..4193eb55e6 --- /dev/null +++ b/contrib/build/gizmos/makefile.wat @@ -0,0 +1,208 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +VENDORTAG = +!ifeq OFFICIAL_BUILD 0 +VENDORTAG = _$(VENDOR) +!endif +!ifeq OFFICIAL_BUILD 1 +VENDORTAG = +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG = +!ifeq BUILD debug +__DEBUGFLAG = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__OPTIMIZEFLAG = +!ifeq BUILD debug +__OPTIMIZEFLAG = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG = -ot -ox +!endif +__RUNTIME_LIBS = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__gizmosdll___depname = +!ifeq SHARED 1 +__gizmosdll___depname = ..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_wat$(VENDORTAG).dll +!endif +__gizmoslib___depname = +!ifeq SHARED 0 +__gizmoslib___depname = ..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib +!endif + +### Variables: ### + +GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_gizmosdll.pch -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\gizmos\..\..\..\include -i=..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\gizmos\..\..\..\src\tiff -i=..\..\src\gizmos\..\..\..\src\jpeg -i=..\..\src\gizmos\..\..\..\src\png -i=..\..\src\gizmos\..\..\..\src\zlib -i=..\..\src\gizmos\..\..\..\src\regex -i=..\..\src\gizmos\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_GIZMOS $(CXXFLAGS) +GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_gizmoslib.pch $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\gizmos\..\..\..\include -i=..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\gizmos\..\..\..\src\tiff -i=..\..\src\gizmos\..\..\..\src\jpeg -i=..\..\src\gizmos\..\..\..\src\png -i=..\..\src\gizmos\..\..\..\src\zlib -i=..\..\src\gizmos\..\..\..\src\regex -i=..\..\src\gizmos\..\..\include $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(__gizmosdll___depname) $(__gizmoslib___depname) + +$(OBJS)\gizmosdll_dummy.obj : .AUTODEPEND ../../src/gizmos\..\..\..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $< + +$(OBJS)\gizmosdll_dynamicsash.obj : .AUTODEPEND ../../src/gizmos\dynamicsash.cpp + $(CXX) -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $< + +$(OBJS)\gizmosdll_editlbox.obj : .AUTODEPEND ../../src/gizmos\editlbox.cpp + $(CXX) -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $< + +$(OBJS)\gizmosdll_ledctrl.obj : .AUTODEPEND ../../src/gizmos\ledctrl.cpp + $(CXX) -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $< + +$(OBJS)\gizmosdll_multicell.obj : .AUTODEPEND ../../src/gizmos\multicell.cpp + $(CXX) -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $< + +$(OBJS)\gizmosdll_splittree.obj : .AUTODEPEND ../../src/gizmos\splittree.cpp + $(CXX) -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $< + +$(OBJS)\gizmosdll_statpict.obj : .AUTODEPEND ../../src/gizmos\statpict.cpp + $(CXX) -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $< + +$(OBJS)\gizmoslib_dummy.obj : .AUTODEPEND ../../src/gizmos\..\..\..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $< + +$(OBJS)\gizmoslib_dynamicsash.obj : .AUTODEPEND ../../src/gizmos\dynamicsash.cpp + $(CXX) -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $< + +$(OBJS)\gizmoslib_editlbox.obj : .AUTODEPEND ../../src/gizmos\editlbox.cpp + $(CXX) -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $< + +$(OBJS)\gizmoslib_ledctrl.obj : .AUTODEPEND ../../src/gizmos\ledctrl.cpp + $(CXX) -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $< + +$(OBJS)\gizmoslib_multicell.obj : .AUTODEPEND ../../src/gizmos\multicell.cpp + $(CXX) -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $< + +$(OBJS)\gizmoslib_splittree.obj : .AUTODEPEND ../../src/gizmos\splittree.cpp + $(CXX) -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $< + +$(OBJS)\gizmoslib_statpict.obj : .AUTODEPEND ../../src/gizmos\statpict.cpp + $(CXX) -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist ..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_wat$(VENDORTAG).dll del ..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_wat$(VENDORTAG).dll + -if exist ..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del ..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib + -if exist ..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib del ..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib + +!ifeq SHARED 1 +..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_wat$(VENDORTAG).dll : $(OBJS)\gizmosdll_dummy.obj $(OBJS)\gizmosdll_dynamicsash.obj $(OBJS)\gizmosdll_editlbox.obj $(OBJS)\gizmosdll_ledctrl.obj $(OBJS)\gizmosdll_multicell.obj $(OBJS)\gizmosdll_splittree.obj $(OBJS)\gizmosdll_statpict.obj + @%create $(OBJS)\gizmosdll.lbc + @%append $(OBJS)\gizmosdll.lbc option quiet + @%append $(OBJS)\gizmosdll.lbc name $^@ + @%append $(OBJS)\gizmosdll.lbc option incremental + @%append $(OBJS)\gizmosdll.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath ..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + @for %i in ( $(OBJS)\gizmosdll_dummy.obj $(OBJS)\gizmosdll_dynamicsash.obj $(OBJS)\gizmosdll_editlbox.obj $(OBJS)\gizmosdll_ledctrl.obj $(OBJS)\gizmosdll_multicell.obj $(OBJS)\gizmosdll_splittree.obj $(OBJS)\gizmosdll_statpict.obj) do @%append $(OBJS)\gizmosdll.lbc file %i + @for %i in ( $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_BASE_p) $(__WXLIB_CORE_p)) do @%append $(OBJS)\gizmosdll.lbc library %i + @%append $(OBJS)\gizmosdll.lbc + @%append $(OBJS)\gizmosdll.lbc system nt_dll + wlink @$(OBJS)\gizmosdll.lbc + wlib -q -n -b ..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib +$^@ +!endif + +!ifeq SHARED 0 +..\..\src\gizmos\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib : $(OBJS)\gizmoslib_dummy.obj $(OBJS)\gizmoslib_dynamicsash.obj $(OBJS)\gizmoslib_editlbox.obj $(OBJS)\gizmoslib_ledctrl.obj $(OBJS)\gizmoslib_multicell.obj $(OBJS)\gizmoslib_splittree.obj $(OBJS)\gizmoslib_statpict.obj + @%create $(OBJS)\gizmoslib.lbc + @for %i in ( $(OBJS)\gizmoslib_dummy.obj $(OBJS)\gizmoslib_dynamicsash.obj $(OBJS)\gizmoslib_editlbox.obj $(OBJS)\gizmoslib_ledctrl.obj $(OBJS)\gizmoslib_multicell.obj $(OBJS)\gizmoslib_splittree.obj $(OBJS)\gizmoslib_statpict.obj) do @%append $(OBJS)\gizmoslib.lbc +%i + wlib -q -p2048 -n -b $^@ @$(OBJS)\gizmoslib.lbc +!endif diff --git a/contrib/build/ogl/makefile.bcc b/contrib/build/ogl/makefile.bcc new file mode 100644 index 0000000000..2f9bb824c4 --- /dev/null +++ b/contrib/build/ogl/makefile.bcc @@ -0,0 +1,230 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OGLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include \ + -I..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I..\..\src\ogl\..\..\..\src\tiff -I..\..\src\ogl\..\..\..\src\jpeg \ + -I..\..\src\ogl\..\..\..\src\png -I..\..\src\ogl\..\..\..\src\zlib \ + -I..\..\src\ogl\..\..\..\src\regex -I..\..\src\ogl\..\..\include \ + -DWXUSINGDLL -DWXMAKINGDLL_OGL -DwxUSE_DEPRECATED=0 $(CXXFLAGS) -Hu \ + -H=$(OBJS)\wxprec_ogldll.csm +OGLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include \ + -I..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I..\..\src\ogl\..\..\..\src\tiff -I..\..\src\ogl\..\..\..\src\jpeg \ + -I..\..\src\ogl\..\..\..\src\png -I..\..\src\ogl\..\..\..\src\zlib \ + -I..\..\src\ogl\..\..\..\src\regex -I..\..\src\ogl\..\..\include \ + $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_ogllib.csm + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(OFFICIAL_BUILD)" == "0" +VENDORTAG = _$(VENDOR) +!endif +!if "$(OFFICIAL_BUILD)" == "1" +VENDORTAG = +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(SHARED)" == "1" +__ogldll___depname = \ + ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll +!endif +!if "$(SHARED)" == "0" +__ogllib___depname = \ + ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__ogldll___depname) $(__ogllib___depname) + +$(OBJS)\ogldll_basic.obj: ../../src/ogl\basic.cpp + $(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogldll_basic2.obj: ../../src/ogl\basic2.cpp + $(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogldll_bmpshape.obj: ../../src/ogl\bmpshape.cpp + $(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogldll_canvas.obj: ../../src/ogl\canvas.cpp + $(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogldll_composit.obj: ../../src/ogl\composit.cpp + $(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogldll_constrnt.obj: ../../src/ogl\constrnt.cpp + $(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogldll_divided.obj: ../../src/ogl\divided.cpp + $(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogldll_drawn.obj: ../../src/ogl\drawn.cpp + $(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogldll_dummy.obj: ../../src/ogl\..\..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) -H $** + +$(OBJS)\ogldll_lines.obj: ../../src/ogl\lines.cpp + $(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogldll_mfutils.obj: ../../src/ogl\mfutils.cpp + $(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogldll_ogldiag.obj: ../../src/ogl\ogldiag.cpp + $(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogldll_oglmisc.obj: ../../src/ogl\oglmisc.cpp + $(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogllib_basic.obj: ../../src/ogl\basic.cpp + $(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $** + +$(OBJS)\ogllib_basic2.obj: ../../src/ogl\basic2.cpp + $(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $** + +$(OBJS)\ogllib_bmpshape.obj: ../../src/ogl\bmpshape.cpp + $(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $** + +$(OBJS)\ogllib_canvas.obj: ../../src/ogl\canvas.cpp + $(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $** + +$(OBJS)\ogllib_composit.obj: ../../src/ogl\composit.cpp + $(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $** + +$(OBJS)\ogllib_constrnt.obj: ../../src/ogl\constrnt.cpp + $(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $** + +$(OBJS)\ogllib_divided.obj: ../../src/ogl\divided.cpp + $(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $** + +$(OBJS)\ogllib_drawn.obj: ../../src/ogl\drawn.cpp + $(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $** + +$(OBJS)\ogllib_dummy.obj: ../../src/ogl\..\..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) -H $** + +$(OBJS)\ogllib_lines.obj: ../../src/ogl\lines.cpp + $(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $** + +$(OBJS)\ogllib_mfutils.obj: ../../src/ogl\mfutils.cpp + $(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $** + +$(OBJS)\ogllib_ogldiag.obj: ../../src/ogl\ogldiag.cpp + $(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $** + +$(OBJS)\ogllib_oglmisc.obj: ../../src/ogl\oglmisc.cpp + $(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll del ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll + -if exist ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib + -if exist ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib + +!if "$(SHARED)" == "1" +..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll: $(OBJS)\ogldll_dummy.obj $(OBJS)\ogldll_dummy.obj $(OBJS)\ogldll_basic2.obj $(OBJS)\ogldll_canvas.obj $(OBJS)\ogldll_divided.obj $(OBJS)\ogldll_mfutils.obj $(OBJS)\ogldll_oglmisc.obj $(OBJS)\ogldll_basic.obj $(OBJS)\ogldll_composit.obj $(OBJS)\ogldll_drawn.obj $(OBJS)\ogldll_bmpshape.obj $(OBJS)\ogldll_constrnt.obj $(OBJS)\ogldll_lines.obj $(OBJS)\ogldll_ogldiag.obj + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| + c0d32.obj $(OBJS)\ogldll_dummy.obj $(OBJS)\ogldll_basic2.obj $(OBJS)\ogldll_canvas.obj $(OBJS)\ogldll_divided.obj $(OBJS)\ogldll_mfutils.obj $(OBJS)\ogldll_oglmisc.obj $(OBJS)\ogldll_basic.obj $(OBJS)\ogldll_composit.obj $(OBJS)\ogldll_drawn.obj $(OBJS)\ogldll_bmpshape.obj $(OBJS)\ogldll_constrnt.obj $(OBJS)\ogldll_lines.obj $(OBJS)\ogldll_ogldiag.obj,$@,, $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,, +| + implib -f ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl $@ +!endif + +!if "$(SHARED)" == "0" +..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib: $(OBJS)\ogllib_dummy.obj $(OBJS)\ogllib_dummy.obj $(OBJS)\ogllib_basic2.obj $(OBJS)\ogllib_canvas.obj $(OBJS)\ogllib_divided.obj $(OBJS)\ogllib_mfutils.obj $(OBJS)\ogllib_oglmisc.obj $(OBJS)\ogllib_basic.obj $(OBJS)\ogllib_composit.obj $(OBJS)\ogllib_drawn.obj $(OBJS)\ogllib_bmpshape.obj $(OBJS)\ogllib_constrnt.obj $(OBJS)\ogllib_lines.obj $(OBJS)\ogllib_ogldiag.obj + if exist $@ del $@ + tlib /a /p2048 $@ @&&| + $(OBJS)\ogllib_dummy.obj $(OBJS)\ogllib_basic2.obj $(OBJS)\ogllib_canvas.obj $(OBJS)\ogllib_divided.obj $(OBJS)\ogllib_mfutils.obj $(OBJS)\ogllib_oglmisc.obj $(OBJS)\ogllib_basic.obj $(OBJS)\ogllib_composit.obj $(OBJS)\ogllib_drawn.obj $(OBJS)\ogllib_bmpshape.obj $(OBJS)\ogllib_constrnt.obj $(OBJS)\ogllib_lines.obj $(OBJS)\ogllib_ogldiag.obj +| +!endif diff --git a/contrib/build/ogl/makefile.gcc b/contrib/build/ogl/makefile.gcc new file mode 100644 index 0000000000..faea8b1f69 --- /dev/null +++ b/contrib/build/ogl/makefile.gcc @@ -0,0 +1,190 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OGLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I..\..\src\ogl\..\..\..\src\tiff -I..\..\src\ogl\..\..\..\src\jpeg -I..\..\src\ogl\..\..\..\src\png -I..\..\src\ogl\..\..\..\src\zlib -I..\..\src\ogl\..\..\..\src\regex -I..\..\src\ogl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_OGL -DwxUSE_DEPRECATED=0 $(CXXFLAGS) +OGLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I..\..\src\ogl\..\..\..\src\tiff -I..\..\src\ogl\..\..\..\src\jpeg -I..\..\src\ogl\..\..\..\src\png -I..\..\src\ogl\..\..\..\src\zlib -I..\..\src\ogl\..\..\..\src\regex -I..\..\src\ogl\..\..\include $(CXXFLAGS) + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(OFFICIAL_BUILD),0) +VENDORTAG = _$(VENDOR) +endif +ifeq ($(OFFICIAL_BUILD),1) +VENDORTAG = +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(SHARED),1) +__ogldll___depname = ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll +endif +ifeq ($(SHARED),0) +__ogllib___depname = ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__ogldll___depname) $(__ogllib___depname) + +$(OBJS)\ogldll_basic.o: ../../src/ogl\basic.cpp + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_basic2.o: ../../src/ogl\basic2.cpp + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_bmpshape.o: ../../src/ogl\bmpshape.cpp + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_canvas.o: ../../src/ogl\canvas.cpp + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_composit.o: ../../src/ogl\composit.cpp + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_constrnt.o: ../../src/ogl\constrnt.cpp + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_divided.o: ../../src/ogl\divided.cpp + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_drawn.o: ../../src/ogl\drawn.cpp + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_dummy.o: ../../src/ogl\..\..\..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_lines.o: ../../src/ogl\lines.cpp + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_mfutils.o: ../../src/ogl\mfutils.cpp + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_ogldiag.o: ../../src/ogl\ogldiag.cpp + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_oglmisc.o: ../../src/ogl\oglmisc.cpp + $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogllib_basic.o: ../../src/ogl\basic.cpp + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_basic2.o: ../../src/ogl\basic2.cpp + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_bmpshape.o: ../../src/ogl\bmpshape.cpp + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_canvas.o: ../../src/ogl\canvas.cpp + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_composit.o: ../../src/ogl\composit.cpp + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_constrnt.o: ../../src/ogl\constrnt.cpp + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_divided.o: ../../src/ogl\divided.cpp + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_drawn.o: ../../src/ogl\drawn.cpp + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_dummy.o: ../../src/ogl\..\..\..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_lines.o: ../../src/ogl\lines.cpp + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_mfutils.o: ../../src/ogl\mfutils.cpp + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_ogldiag.o: ../../src/ogl\ogldiag.cpp + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_oglmisc.o: ../../src/ogl\oglmisc.cpp + $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $< + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll del ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll + -if exist ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a del ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a + -if exist ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a del ..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a + +ifeq ($(SHARED),1) +..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll: $(OBJS)\ogldll_dummy.o $(OBJS)\ogldll_basic2.o $(OBJS)\ogldll_canvas.o $(OBJS)\ogldll_divided.o $(OBJS)\ogldll_mfutils.o $(OBJS)\ogldll_oglmisc.o $(OBJS)\ogldll_basic.o $(OBJS)\ogldll_composit.o $(OBJS)\ogldll_drawn.o $(OBJS)\ogldll_bmpshape.o $(OBJS)\ogldll_constrnt.o $(OBJS)\ogldll_lines.o $(OBJS)\ogldll_ogldiag.o + $(CXX) -shared -o $@ $(OBJS)\ogldll_dummy.o $(OBJS)\ogldll_basic2.o $(OBJS)\ogldll_canvas.o $(OBJS)\ogldll_divided.o $(OBJS)\ogldll_mfutils.o $(OBJS)\ogldll_oglmisc.o $(OBJS)\ogldll_basic.o $(OBJS)\ogldll_composit.o $(OBJS)\ogldll_drawn.o $(OBJS)\ogldll_bmpshape.o $(OBJS)\ogldll_constrnt.o $(OBJS)\ogldll_lines.o $(OBJS)\ogldll_ogldiag.o $(LDFLAGS) -Wl,--out-implib,..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a $(__DEBUGFLAG) -mthreads -L..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) +endif + +ifeq ($(SHARED),0) +..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a: $(OBJS)\ogllib_dummy.o $(OBJS)\ogllib_basic2.o $(OBJS)\ogllib_canvas.o $(OBJS)\ogllib_divided.o $(OBJS)\ogllib_mfutils.o $(OBJS)\ogllib_oglmisc.o $(OBJS)\ogllib_basic.o $(OBJS)\ogllib_composit.o $(OBJS)\ogllib_drawn.o $(OBJS)\ogllib_bmpshape.o $(OBJS)\ogllib_constrnt.o $(OBJS)\ogllib_lines.o $(OBJS)\ogllib_ogldiag.o + if exist $@ del $@ + ar rcu $@ $(OBJS)\ogllib_dummy.o $(OBJS)\ogllib_basic2.o $(OBJS)\ogllib_canvas.o $(OBJS)\ogllib_divided.o $(OBJS)\ogllib_mfutils.o $(OBJS)\ogllib_oglmisc.o $(OBJS)\ogllib_basic.o $(OBJS)\ogllib_composit.o $(OBJS)\ogllib_drawn.o $(OBJS)\ogllib_bmpshape.o $(OBJS)\ogllib_constrnt.o $(OBJS)\ogllib_lines.o $(OBJS)\ogllib_ogldiag.o + ranlib $@ +endif + +.PHONY: all clean diff --git a/contrib/build/ogl/makefile.vc b/contrib/build/ogl/makefile.vc new file mode 100644 index 0000000000..17df69dc27 --- /dev/null +++ b/contrib/build/ogl/makefile.vc @@ -0,0 +1,207 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OGLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) $(__DEBUGFLAG) /Fd..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).pdb $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\ogl\..\..\..\include /I..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\ogl\..\..\..\src\tiff /I..\..\src\ogl\..\..\..\src\jpeg /I..\..\src\ogl\..\..\..\src\png /I..\..\src\ogl\..\..\..\src\zlib /I..\..\src\ogl\..\..\..\src\regex /Fp$(OBJS)\wxprec_ogldll.pch /I..\..\src\ogl\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_OGL /DwxUSE_DEPRECATED=0 $(CXXFLAGS) /Yuwx/wxprec.h +OGLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) $(__DEBUGFLAG) /Fd..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.pdb $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\ogl\..\..\..\include /I..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\ogl\..\..\..\src\tiff /I..\..\src\ogl\..\..\..\src\jpeg /I..\..\src\ogl\..\..\..\src\png /I..\..\src\ogl\..\..\..\src\zlib /I..\..\src\ogl\..\..\..\src\regex /Fp$(OBJS)\wxprec_ogllib.pch /I..\..\src\ogl\..\..\include $(CXXFLAGS) /Yuwx/wxprec.h + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(OFFICIAL_BUILD)" == "0" +VENDORTAG = _$(VENDOR) +!endif +!if "$(OFFICIAL_BUILD)" == "1" +VENDORTAG = +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_3 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_3 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(SHARED)" == "1" +__ogldll___depname = ..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).dll +!endif +!if "$(SHARED)" == "0" +__ogllib___depname = ..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__ogldll___depname) $(__ogllib___depname) + +$(OBJS)\ogldll_basic.obj: ../../src/ogl\basic.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogldll_basic2.obj: ../../src/ogl\basic2.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogldll_bmpshape.obj: ../../src/ogl\bmpshape.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogldll_canvas.obj: ../../src/ogl\canvas.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogldll_composit.obj: ../../src/ogl\composit.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogldll_constrnt.obj: ../../src/ogl\constrnt.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogldll_divided.obj: ../../src/ogl\divided.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogldll_drawn.obj: ../../src/ogl\drawn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogldll_dummy.obj: ../../src/ogl\..\..\..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\ogldll_lines.obj: ../../src/ogl\lines.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogldll_mfutils.obj: ../../src/ogl\mfutils.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogldll_ogldiag.obj: ../../src/ogl\ogldiag.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogldll_oglmisc.obj: ../../src/ogl\oglmisc.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $** + +$(OBJS)\ogllib_basic.obj: ../../src/ogl\basic.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $** + +$(OBJS)\ogllib_basic2.obj: ../../src/ogl\basic2.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $** + +$(OBJS)\ogllib_bmpshape.obj: ../../src/ogl\bmpshape.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $** + +$(OBJS)\ogllib_canvas.obj: ../../src/ogl\canvas.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $** + +$(OBJS)\ogllib_composit.obj: ../../src/ogl\composit.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $** + +$(OBJS)\ogllib_constrnt.obj: ../../src/ogl\constrnt.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $** + +$(OBJS)\ogllib_divided.obj: ../../src/ogl\divided.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $** + +$(OBJS)\ogllib_drawn.obj: ../../src/ogl\drawn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $** + +$(OBJS)\ogllib_dummy.obj: ../../src/ogl\..\..\..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\ogllib_lines.obj: ../../src/ogl\lines.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $** + +$(OBJS)\ogllib_mfutils.obj: ../../src/ogl\mfutils.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $** + +$(OBJS)\ogllib_ogldiag.obj: ../../src/ogl\ogldiag.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $** + +$(OBJS)\ogllib_oglmisc.obj: ../../src/ogl\oglmisc.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist ..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).dll del ..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).dll + -if exist ..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del ..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib + -if exist ..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del ..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib + +!if "$(SHARED)" == "1" +..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).dll: $(OBJS)\ogldll_dummy.obj $(OBJS)\ogldll_dummy.obj $(OBJS)\ogldll_basic2.obj $(OBJS)\ogldll_canvas.obj $(OBJS)\ogldll_divided.obj $(OBJS)\ogldll_mfutils.obj $(OBJS)\ogldll_oglmisc.obj $(OBJS)\ogldll_basic.obj $(OBJS)\ogldll_composit.obj $(OBJS)\ogldll_drawn.obj $(OBJS)\ogldll_bmpshape.obj $(OBJS)\ogldll_constrnt.obj $(OBJS)\ogldll_lines.obj $(OBJS)\ogldll_ogldiag.obj + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @<< + $(OBJS)\ogldll_dummy.obj $(OBJS)\ogldll_basic2.obj $(OBJS)\ogldll_canvas.obj $(OBJS)\ogldll_divided.obj $(OBJS)\ogldll_mfutils.obj $(OBJS)\ogldll_oglmisc.obj $(OBJS)\ogldll_basic.obj $(OBJS)\ogldll_composit.obj $(OBJS)\ogldll_drawn.obj $(OBJS)\ogldll_bmpshape.obj $(OBJS)\ogldll_constrnt.obj $(OBJS)\ogldll_lines.obj $(OBJS)\ogldll_ogldiag.obj $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib +<< +!endif + +!if "$(SHARED)" == "0" +..\..\src\ogl\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib: $(OBJS)\ogllib_dummy.obj $(OBJS)\ogllib_dummy.obj $(OBJS)\ogllib_basic2.obj $(OBJS)\ogllib_canvas.obj $(OBJS)\ogllib_divided.obj $(OBJS)\ogllib_mfutils.obj $(OBJS)\ogllib_oglmisc.obj $(OBJS)\ogllib_basic.obj $(OBJS)\ogllib_composit.obj $(OBJS)\ogllib_drawn.obj $(OBJS)\ogllib_bmpshape.obj $(OBJS)\ogllib_constrnt.obj $(OBJS)\ogllib_lines.obj $(OBJS)\ogllib_ogldiag.obj + if exist $@ del $@ + lib /NOLOGO /OUT:$@ @<< + $(OBJS)\ogllib_dummy.obj $(OBJS)\ogllib_basic2.obj $(OBJS)\ogllib_canvas.obj $(OBJS)\ogllib_divided.obj $(OBJS)\ogllib_mfutils.obj $(OBJS)\ogllib_oglmisc.obj $(OBJS)\ogllib_basic.obj $(OBJS)\ogllib_composit.obj $(OBJS)\ogllib_drawn.obj $(OBJS)\ogllib_bmpshape.obj $(OBJS)\ogllib_constrnt.obj $(OBJS)\ogllib_lines.obj $(OBJS)\ogllib_ogldiag.obj +<< +!endif diff --git a/contrib/build/ogl/makefile.wat b/contrib/build/ogl/makefile.wat new file mode 100644 index 0000000000..8ffa6b5674 --- /dev/null +++ b/contrib/build/ogl/makefile.wat @@ -0,0 +1,244 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +VENDORTAG = +!ifeq OFFICIAL_BUILD 0 +VENDORTAG = _$(VENDOR) +!endif +!ifeq OFFICIAL_BUILD 1 +VENDORTAG = +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG = +!ifeq BUILD debug +__DEBUGFLAG = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__OPTIMIZEFLAG = +!ifeq BUILD debug +__OPTIMIZEFLAG = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG = -ot -ox +!endif +__RUNTIME_LIBS = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__ogldll___depname = +!ifeq SHARED 1 +__ogldll___depname = ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_wat$(VENDORTAG).dll +!endif +__ogllib___depname = +!ifeq SHARED 0 +__ogllib___depname = ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OGLDLL_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_ogldll.pch -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\ogl\..\..\..\include -i=..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\ogl\..\..\..\src\tiff -i=..\..\src\ogl\..\..\..\src\jpeg -i=..\..\src\ogl\..\..\..\src\png -i=..\..\src\ogl\..\..\..\src\zlib -i=..\..\src\ogl\..\..\..\src\regex -i=..\..\src\ogl\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_OGL -dwxUSE_DEPRECATED=0 $(CXXFLAGS) +OGLLIB_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_ogllib.pch $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\ogl\..\..\..\include -i=..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\ogl\..\..\..\src\tiff -i=..\..\src\ogl\..\..\..\src\jpeg -i=..\..\src\ogl\..\..\..\src\png -i=..\..\src\ogl\..\..\..\src\zlib -i=..\..\src\ogl\..\..\..\src\regex -i=..\..\src\ogl\..\..\include $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(__ogldll___depname) $(__ogllib___depname) + +$(OBJS)\ogldll_basic.obj : .AUTODEPEND ../../src/ogl\basic.cpp + $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_basic2.obj : .AUTODEPEND ../../src/ogl\basic2.cpp + $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_bmpshape.obj : .AUTODEPEND ../../src/ogl\bmpshape.cpp + $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_canvas.obj : .AUTODEPEND ../../src/ogl\canvas.cpp + $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_composit.obj : .AUTODEPEND ../../src/ogl\composit.cpp + $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_constrnt.obj : .AUTODEPEND ../../src/ogl\constrnt.cpp + $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_divided.obj : .AUTODEPEND ../../src/ogl\divided.cpp + $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_drawn.obj : .AUTODEPEND ../../src/ogl\drawn.cpp + $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_dummy.obj : .AUTODEPEND ../../src/ogl\..\..\..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_lines.obj : .AUTODEPEND ../../src/ogl\lines.cpp + $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_mfutils.obj : .AUTODEPEND ../../src/ogl\mfutils.cpp + $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_ogldiag.obj : .AUTODEPEND ../../src/ogl\ogldiag.cpp + $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogldll_oglmisc.obj : .AUTODEPEND ../../src/ogl\oglmisc.cpp + $(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $< + +$(OBJS)\ogllib_basic.obj : .AUTODEPEND ../../src/ogl\basic.cpp + $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_basic2.obj : .AUTODEPEND ../../src/ogl\basic2.cpp + $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_bmpshape.obj : .AUTODEPEND ../../src/ogl\bmpshape.cpp + $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_canvas.obj : .AUTODEPEND ../../src/ogl\canvas.cpp + $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_composit.obj : .AUTODEPEND ../../src/ogl\composit.cpp + $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_constrnt.obj : .AUTODEPEND ../../src/ogl\constrnt.cpp + $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_divided.obj : .AUTODEPEND ../../src/ogl\divided.cpp + $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_drawn.obj : .AUTODEPEND ../../src/ogl\drawn.cpp + $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_dummy.obj : .AUTODEPEND ../../src/ogl\..\..\..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_lines.obj : .AUTODEPEND ../../src/ogl\lines.cpp + $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_mfutils.obj : .AUTODEPEND ../../src/ogl\mfutils.cpp + $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_ogldiag.obj : .AUTODEPEND ../../src/ogl\ogldiag.cpp + $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + +$(OBJS)\ogllib_oglmisc.obj : .AUTODEPEND ../../src/ogl\oglmisc.cpp + $(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_wat$(VENDORTAG).dll del ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_wat$(VENDORTAG).dll + -if exist ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib + -if exist ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib + +!ifeq SHARED 1 +..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_wat$(VENDORTAG).dll : $(OBJS)\ogldll_dummy.obj $(OBJS)\ogldll_basic2.obj $(OBJS)\ogldll_canvas.obj $(OBJS)\ogldll_divided.obj $(OBJS)\ogldll_mfutils.obj $(OBJS)\ogldll_oglmisc.obj $(OBJS)\ogldll_basic.obj $(OBJS)\ogldll_composit.obj $(OBJS)\ogldll_drawn.obj $(OBJS)\ogldll_bmpshape.obj $(OBJS)\ogldll_constrnt.obj $(OBJS)\ogldll_lines.obj $(OBJS)\ogldll_ogldiag.obj + @%create $(OBJS)\ogldll.lbc + @%append $(OBJS)\ogldll.lbc option quiet + @%append $(OBJS)\ogldll.lbc name $^@ + @%append $(OBJS)\ogldll.lbc option incremental + @%append $(OBJS)\ogldll.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + @for %i in ( $(OBJS)\ogldll_dummy.obj $(OBJS)\ogldll_basic2.obj $(OBJS)\ogldll_canvas.obj $(OBJS)\ogldll_divided.obj $(OBJS)\ogldll_mfutils.obj $(OBJS)\ogldll_oglmisc.obj $(OBJS)\ogldll_basic.obj $(OBJS)\ogldll_composit.obj $(OBJS)\ogldll_drawn.obj $(OBJS)\ogldll_bmpshape.obj $(OBJS)\ogldll_constrnt.obj $(OBJS)\ogldll_lines.obj $(OBJS)\ogldll_ogldiag.obj) do @%append $(OBJS)\ogldll.lbc file %i + @for %i in ( $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\ogldll.lbc library %i + @%append $(OBJS)\ogldll.lbc + @%append $(OBJS)\ogldll.lbc system nt_dll + wlink @$(OBJS)\ogldll.lbc + wlib -q -n -b ..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib +$^@ +!endif + +!ifeq SHARED 0 +..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib : $(OBJS)\ogllib_dummy.obj $(OBJS)\ogllib_basic2.obj $(OBJS)\ogllib_canvas.obj $(OBJS)\ogllib_divided.obj $(OBJS)\ogllib_mfutils.obj $(OBJS)\ogllib_oglmisc.obj $(OBJS)\ogllib_basic.obj $(OBJS)\ogllib_composit.obj $(OBJS)\ogllib_drawn.obj $(OBJS)\ogllib_bmpshape.obj $(OBJS)\ogllib_constrnt.obj $(OBJS)\ogllib_lines.obj $(OBJS)\ogllib_ogldiag.obj + @%create $(OBJS)\ogllib.lbc + @for %i in ( $(OBJS)\ogllib_dummy.obj $(OBJS)\ogllib_basic2.obj $(OBJS)\ogllib_canvas.obj $(OBJS)\ogllib_divided.obj $(OBJS)\ogllib_mfutils.obj $(OBJS)\ogllib_oglmisc.obj $(OBJS)\ogllib_basic.obj $(OBJS)\ogllib_composit.obj $(OBJS)\ogllib_drawn.obj $(OBJS)\ogllib_bmpshape.obj $(OBJS)\ogllib_constrnt.obj $(OBJS)\ogllib_lines.obj $(OBJS)\ogllib_ogldiag.obj) do @%append $(OBJS)\ogllib.lbc +%i + wlib -q -p2048 -n -b $^@ @$(OBJS)\ogllib.lbc +!endif diff --git a/contrib/build/stc/makefile.bcc b/contrib/build/stc/makefile.bcc new file mode 100644 index 0000000000..9631cd7248 --- /dev/null +++ b/contrib/build/stc/makefile.bcc @@ -0,0 +1,454 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +STCDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include \ + -I..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I..\..\src\stc\..\..\..\src\tiff -I..\..\src\stc\..\..\..\src\jpeg \ + -I..\..\src\stc\..\..\..\src\png -I..\..\src\stc\..\..\..\src\zlib \ + -I..\..\src\stc\..\..\..\src\regex -I..\..\src\stc\..\..\include \ + -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\src -D__WX__ \ + -DSCI_LEXER -DLINK_LEXERS -DWXUSINGDLL -DWXMAKINGDLL_STC $(CXXFLAGS) -Hu \ + -H=$(OBJS)\wxprec_stcdll.csm +STCLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include \ + -I..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I..\..\src\stc\..\..\..\src\tiff -I..\..\src\stc\..\..\..\src\jpeg \ + -I..\..\src\stc\..\..\..\src\png -I..\..\src\stc\..\..\..\src\zlib \ + -I..\..\src\stc\..\..\..\src\regex -I..\..\src\stc\..\..\include \ + -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\src -D__WX__ \ + -DSCI_LEXER -DLINK_LEXERS $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_stclib.csm + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(OFFICIAL_BUILD)" == "0" +VENDORTAG = _$(VENDOR) +!endif +!if "$(OFFICIAL_BUILD)" == "1" +VENDORTAG = +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(SHARED)" == "1" +__stcdll___depname = \ + ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll +!endif +!if "$(SHARED)" == "0" +__stclib___depname = \ + ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__stcdll___depname) $(__stclib___depname) + +$(OBJS)\stcdll_AutoComplete.obj: ../../src/stc\scintilla\src\AutoComplete.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_CallTip.obj: ../../src/stc\scintilla\src\CallTip.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_CellBuffer.obj: ../../src/stc\scintilla\src\CellBuffer.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_ContractionState.obj: ../../src/stc\scintilla\src\ContractionState.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_Document.obj: ../../src/stc\scintilla\src\Document.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_DocumentAccessor.obj: ../../src/stc\scintilla\src\DocumentAccessor.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_Editor.obj: ../../src/stc\scintilla\src\Editor.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_ExternalLexer.obj: ../../src/stc\scintilla\src\ExternalLexer.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_Indicator.obj: ../../src/stc\scintilla\src\Indicator.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_KeyMap.obj: ../../src/stc\scintilla\src\KeyMap.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_KeyWords.obj: ../../src/stc\scintilla\src\KeyWords.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexAVE.obj: ../../src/stc\scintilla\src\LexAVE.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexAda.obj: ../../src/stc\scintilla\src\LexAda.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexAsm.obj: ../../src/stc\scintilla\src\LexAsm.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexBaan.obj: ../../src/stc\scintilla\src\LexBaan.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexBullant.obj: ../../src/stc\scintilla\src\LexBullant.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexCPP.obj: ../../src/stc\scintilla\src\LexCPP.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexCSS.obj: ../../src/stc\scintilla\src\LexCSS.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexConf.obj: ../../src/stc\scintilla\src\LexConf.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexCrontab.obj: ../../src/stc\scintilla\src\LexCrontab.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexEScript.obj: ../../src/stc\scintilla\src\LexEScript.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexEiffel.obj: ../../src/stc\scintilla\src\LexEiffel.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexFortran.obj: ../../src/stc\scintilla\src\LexFortran.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexHTML.obj: ../../src/stc\scintilla\src\LexHTML.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexLisp.obj: ../../src/stc\scintilla\src\LexLisp.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexLout.obj: ../../src/stc\scintilla\src\LexLout.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexLua.obj: ../../src/stc\scintilla\src\LexLua.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexMatlab.obj: ../../src/stc\scintilla\src\LexMatlab.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexOthers.obj: ../../src/stc\scintilla\src\LexOthers.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexPOV.obj: ../../src/stc\scintilla\src\LexPOV.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexPascal.obj: ../../src/stc\scintilla\src\LexPascal.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexPerl.obj: ../../src/stc\scintilla\src\LexPerl.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexPython.obj: ../../src/stc\scintilla\src\LexPython.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexRuby.obj: ../../src/stc\scintilla\src\LexRuby.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexSQL.obj: ../../src/stc\scintilla\src\LexSQL.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexVB.obj: ../../src/stc\scintilla\src\LexVB.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LineMarker.obj: ../../src/stc\scintilla\src\LineMarker.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_PlatWX.obj: ../../src/stc\PlatWX.cpp + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_PropSet.obj: ../../src/stc\scintilla\src\PropSet.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_RESearch.obj: ../../src/stc\scintilla\src\RESearch.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_ScintillaBase.obj: ../../src/stc\scintilla\src\ScintillaBase.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_ScintillaWX.obj: ../../src/stc\ScintillaWX.cpp + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_Style.obj: ../../src/stc\scintilla\src\Style.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_StyleContext.obj: ../../src/stc\scintilla\src\StyleContext.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_UniConversion.obj: ../../src/stc\scintilla\src\UniConversion.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_ViewStyle.obj: ../../src/stc\scintilla\src\ViewStyle.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_WindowAccessor.obj: ../../src/stc\scintilla\src\WindowAccessor.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_XPM.obj: ../../src/stc\scintilla\src\XPM.cxx + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_dummy.obj: ../../src/stc\..\..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) -H $** + +$(OBJS)\stcdll_stc.obj: ../../src/stc\stc.cpp + $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stclib_AutoComplete.obj: ../../src/stc\scintilla\src\AutoComplete.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_CallTip.obj: ../../src/stc\scintilla\src\CallTip.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_CellBuffer.obj: ../../src/stc\scintilla\src\CellBuffer.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_ContractionState.obj: ../../src/stc\scintilla\src\ContractionState.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_Document.obj: ../../src/stc\scintilla\src\Document.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_DocumentAccessor.obj: ../../src/stc\scintilla\src\DocumentAccessor.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_Editor.obj: ../../src/stc\scintilla\src\Editor.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_ExternalLexer.obj: ../../src/stc\scintilla\src\ExternalLexer.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_Indicator.obj: ../../src/stc\scintilla\src\Indicator.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_KeyMap.obj: ../../src/stc\scintilla\src\KeyMap.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_KeyWords.obj: ../../src/stc\scintilla\src\KeyWords.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexAVE.obj: ../../src/stc\scintilla\src\LexAVE.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexAda.obj: ../../src/stc\scintilla\src\LexAda.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexAsm.obj: ../../src/stc\scintilla\src\LexAsm.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexBaan.obj: ../../src/stc\scintilla\src\LexBaan.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexBullant.obj: ../../src/stc\scintilla\src\LexBullant.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexCPP.obj: ../../src/stc\scintilla\src\LexCPP.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexCSS.obj: ../../src/stc\scintilla\src\LexCSS.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexConf.obj: ../../src/stc\scintilla\src\LexConf.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexCrontab.obj: ../../src/stc\scintilla\src\LexCrontab.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexEScript.obj: ../../src/stc\scintilla\src\LexEScript.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexEiffel.obj: ../../src/stc\scintilla\src\LexEiffel.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexFortran.obj: ../../src/stc\scintilla\src\LexFortran.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexHTML.obj: ../../src/stc\scintilla\src\LexHTML.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexLisp.obj: ../../src/stc\scintilla\src\LexLisp.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexLout.obj: ../../src/stc\scintilla\src\LexLout.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexLua.obj: ../../src/stc\scintilla\src\LexLua.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexMatlab.obj: ../../src/stc\scintilla\src\LexMatlab.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexOthers.obj: ../../src/stc\scintilla\src\LexOthers.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexPOV.obj: ../../src/stc\scintilla\src\LexPOV.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexPascal.obj: ../../src/stc\scintilla\src\LexPascal.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexPerl.obj: ../../src/stc\scintilla\src\LexPerl.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexPython.obj: ../../src/stc\scintilla\src\LexPython.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexRuby.obj: ../../src/stc\scintilla\src\LexRuby.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexSQL.obj: ../../src/stc\scintilla\src\LexSQL.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexVB.obj: ../../src/stc\scintilla\src\LexVB.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LineMarker.obj: ../../src/stc\scintilla\src\LineMarker.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_PlatWX.obj: ../../src/stc\PlatWX.cpp + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_PropSet.obj: ../../src/stc\scintilla\src\PropSet.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_RESearch.obj: ../../src/stc\scintilla\src\RESearch.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_ScintillaBase.obj: ../../src/stc\scintilla\src\ScintillaBase.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_ScintillaWX.obj: ../../src/stc\ScintillaWX.cpp + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_Style.obj: ../../src/stc\scintilla\src\Style.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_StyleContext.obj: ../../src/stc\scintilla\src\StyleContext.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_UniConversion.obj: ../../src/stc\scintilla\src\UniConversion.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_ViewStyle.obj: ../../src/stc\scintilla\src\ViewStyle.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_WindowAccessor.obj: ../../src/stc\scintilla\src\WindowAccessor.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_XPM.obj: ../../src/stc\scintilla\src\XPM.cxx + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_dummy.obj: ../../src/stc\..\..\..\src\msw\dummy.cpp + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) -H $** + +$(OBJS)\stclib_stc.obj: ../../src/stc\stc.cpp + $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll del ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll + -if exist ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib + -if exist ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib + +!if "$(SHARED)" == "1" +..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll: $(OBJS)\stcdll_dummy.obj $(OBJS)\stcdll_dummy.obj $(OBJS)\stcdll_PlatWX.obj $(OBJS)\stcdll_ScintillaWX.obj $(OBJS)\stcdll_stc.obj $(OBJS)\stcdll_AutoComplete.obj $(OBJS)\stcdll_CallTip.obj $(OBJS)\stcdll_CellBuffer.obj $(OBJS)\stcdll_ContractionState.obj $(OBJS)\stcdll_Document.obj $(OBJS)\stcdll_DocumentAccessor.obj $(OBJS)\stcdll_Editor.obj $(OBJS)\stcdll_ExternalLexer.obj $(OBJS)\stcdll_Indicator.obj $(OBJS)\stcdll_KeyMap.obj $(OBJS)\stcdll_KeyWords.obj $(OBJS)\stcdll_LexAVE.obj $(OBJS)\stcdll_LexAda.obj $(OBJS)\stcdll_LexAsm.obj $(OBJS)\stcdll_LexBaan.obj $(OBJS)\stcdll_LexBullant.obj $(OBJS)\stcdll_LexCPP.obj $(OBJS)\stcdll_LexCSS.obj $(OBJS)\stcdll_LexConf.obj $(OBJS)\stcdll_LexCrontab.obj $(OBJS)\stcdll_LexEiffel.obj $(OBJS)\stcdll_LexEScript.obj $(OBJS)\stcdll_LexFortran.obj $(OBJS)\stcdll_LexHTML.obj $(OBJS)\stcdll_LexLisp.obj $(OBJS)\stcdll_LexLout.obj $(OBJS)\stcdll_LexLua.obj $(OBJS)\stcdll_LexMatlab.obj $(OBJS)\stcdll_LexOthers.obj $(OBJS)\stcdll_LexPOV.obj $(OBJS)\stcdll_LexPascal.obj $(OBJS)\stcdll_LexPerl.obj $(OBJS)\stcdll_LexPython.obj $(OBJS)\stcdll_LexRuby.obj $(OBJS)\stcdll_LexSQL.obj $(OBJS)\stcdll_LexVB.obj $(OBJS)\stcdll_LineMarker.obj $(OBJS)\stcdll_PropSet.obj $(OBJS)\stcdll_RESearch.obj $(OBJS)\stcdll_ScintillaBase.obj $(OBJS)\stcdll_Style.obj $(OBJS)\stcdll_StyleContext.obj $(OBJS)\stcdll_UniConversion.obj $(OBJS)\stcdll_ViewStyle.obj $(OBJS)\stcdll_WindowAccessor.obj $(OBJS)\stcdll_XPM.obj + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| + c0d32.obj $(OBJS)\stcdll_dummy.obj $(OBJS)\stcdll_PlatWX.obj $(OBJS)\stcdll_ScintillaWX.obj $(OBJS)\stcdll_stc.obj $(OBJS)\stcdll_AutoComplete.obj $(OBJS)\stcdll_CallTip.obj $(OBJS)\stcdll_CellBuffer.obj $(OBJS)\stcdll_ContractionState.obj $(OBJS)\stcdll_Document.obj $(OBJS)\stcdll_DocumentAccessor.obj $(OBJS)\stcdll_Editor.obj $(OBJS)\stcdll_ExternalLexer.obj $(OBJS)\stcdll_Indicator.obj $(OBJS)\stcdll_KeyMap.obj $(OBJS)\stcdll_KeyWords.obj $(OBJS)\stcdll_LexAVE.obj $(OBJS)\stcdll_LexAda.obj $(OBJS)\stcdll_LexAsm.obj $(OBJS)\stcdll_LexBaan.obj $(OBJS)\stcdll_LexBullant.obj $(OBJS)\stcdll_LexCPP.obj $(OBJS)\stcdll_LexCSS.obj $(OBJS)\stcdll_LexConf.obj $(OBJS)\stcdll_LexCrontab.obj $(OBJS)\stcdll_LexEiffel.obj $(OBJS)\stcdll_LexEScript.obj $(OBJS)\stcdll_LexFortran.obj $(OBJS)\stcdll_LexHTML.obj $(OBJS)\stcdll_LexLisp.obj $(OBJS)\stcdll_LexLout.obj $(OBJS)\stcdll_LexLua.obj $(OBJS)\stcdll_LexMatlab.obj $(OBJS)\stcdll_LexOthers.obj $(OBJS)\stcdll_LexPOV.obj $(OBJS)\stcdll_LexPascal.obj $(OBJS)\stcdll_LexPerl.obj $(OBJS)\stcdll_LexPython.obj $(OBJS)\stcdll_LexRuby.obj $(OBJS)\stcdll_LexSQL.obj $(OBJS)\stcdll_LexVB.obj $(OBJS)\stcdll_LineMarker.obj $(OBJS)\stcdll_PropSet.obj $(OBJS)\stcdll_RESearch.obj $(OBJS)\stcdll_ScintillaBase.obj $(OBJS)\stcdll_Style.obj $(OBJS)\stcdll_StyleContext.obj $(OBJS)\stcdll_UniConversion.obj $(OBJS)\stcdll_ViewStyle.obj $(OBJS)\stcdll_WindowAccessor.obj $(OBJS)\stcdll_XPM.obj,$@,, $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,, +| + implib -f ..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc $@ +!endif + +!if "$(SHARED)" == "0" +..\..\src\stc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib: $(OBJS)\stclib_dummy.obj $(OBJS)\stclib_dummy.obj $(OBJS)\stclib_PlatWX.obj $(OBJS)\stclib_ScintillaWX.obj $(OBJS)\stclib_stc.obj $(OBJS)\stclib_AutoComplete.obj $(OBJS)\stclib_CallTip.obj $(OBJS)\stclib_CellBuffer.obj $(OBJS)\stclib_ContractionState.obj $(OBJS)\stclib_Document.obj $(OBJS)\stclib_DocumentAccessor.obj $(OBJS)\stclib_Editor.obj $(OBJS)\stclib_ExternalLexer.obj $(OBJS)\stclib_Indicator.obj $(OBJS)\stclib_KeyMap.obj $(OBJS)\stclib_KeyWords.obj $(OBJS)\stclib_LexAVE.obj $(OBJS)\stclib_LexAda.obj $(OBJS)\stclib_LexAsm.obj $(OBJS)\stclib_LexBaan.obj $(OBJS)\stclib_LexBullant.obj $(OBJS)\stclib_LexCPP.obj $(OBJS)\stclib_LexCSS.obj $(OBJS)\stclib_LexConf.obj $(OBJS)\stclib_LexCrontab.obj $(OBJS)\stclib_LexEiffel.obj $(OBJS)\stclib_LexEScript.obj $(OBJS)\stclib_LexFortran.obj $(OBJS)\stclib_LexHTML.obj $(OBJS)\stclib_LexLisp.obj $(OBJS)\stclib_LexLout.obj $(OBJS)\stclib_LexLua.obj $(OBJS)\stclib_LexMatlab.obj $(OBJS)\stclib_LexOthers.obj $(OBJS)\stclib_LexPOV.obj $(OBJS)\stclib_LexPascal.obj $(OBJS)\stclib_LexPerl.obj $(OBJS)\stclib_LexPython.obj $(OBJS)\stclib_LexRuby.obj $(OBJS)\stclib_LexSQL.obj $(OBJS)\stclib_LexVB.obj $(OBJS)\stclib_LineMarker.obj $(OBJS)\stclib_PropSet.obj $(OBJS)\stclib_RESearch.obj $(OBJS)\stclib_ScintillaBase.obj $(OBJS)\stclib_Style.obj $(OBJS)\stclib_StyleContext.obj $(OBJS)\stclib_UniConversion.obj $(OBJS)\stclib_ViewStyle.obj $(OBJS)\stclib_WindowAccessor.obj $(OBJS)\stclib_XPM.obj + if exist $@ del $@ + tlib /a /p2048 $@ @&&| + $(OBJS)\stclib_dummy.obj $(OBJS)\stclib_PlatWX.obj $(OBJS)\stclib_ScintillaWX.obj $(OBJS)\stclib_stc.obj $(OBJS)\stclib_AutoComplete.obj $(OBJS)\stclib_CallTip.obj $(OBJS)\stclib_CellBuffer.obj $(OBJS)\stclib_ContractionState.obj $(OBJS)\stclib_Document.obj $(OBJS)\stclib_DocumentAccessor.obj $(OBJS)\stclib_Editor.obj $(OBJS)\stclib_ExternalLexer.obj $(OBJS)\stclib_Indicator.obj $(OBJS)\stclib_KeyMap.obj $(OBJS)\stclib_KeyWords.obj $(OBJS)\stclib_LexAVE.obj $(OBJS)\stclib_LexAda.obj $(OBJS)\stclib_LexAsm.obj $(OBJS)\stclib_LexBaan.obj $(OBJS)\stclib_LexBullant.obj $(OBJS)\stclib_LexCPP.obj $(OBJS)\stclib_LexCSS.obj $(OBJS)\stclib_LexConf.obj $(OBJS)\stclib_LexCrontab.obj $(OBJS)\stclib_LexEiffel.obj $(OBJS)\stclib_LexEScript.obj $(OBJS)\stclib_LexFortran.obj $(OBJS)\stclib_LexHTML.obj $(OBJS)\stclib_LexLisp.obj $(OBJS)\stclib_LexLout.obj $(OBJS)\stclib_LexLua.obj $(OBJS)\stclib_LexMatlab.obj $(OBJS)\stclib_LexOthers.obj $(OBJS)\stclib_LexPOV.obj $(OBJS)\stclib_LexPascal.obj $(OBJS)\stclib_LexPerl.obj $(OBJS)\stclib_LexPython.obj $(OBJS)\stclib_LexRuby.obj $(OBJS)\stclib_LexSQL.obj $(OBJS)\stclib_LexVB.obj $(OBJS)\stclib_LineMarker.obj $(OBJS)\stclib_PropSet.obj $(OBJS)\stclib_RESearch.obj $(OBJS)\stclib_ScintillaBase.obj $(OBJS)\stclib_Style.obj $(OBJS)\stclib_StyleContext.obj $(OBJS)\stclib_UniConversion.obj $(OBJS)\stclib_ViewStyle.obj $(OBJS)\stclib_WindowAccessor.obj $(OBJS)\stclib_XPM.obj +| +!endif diff --git a/contrib/build/stc/makefile.gcc b/contrib/build/stc/makefile.gcc new file mode 100644 index 0000000000..763dcbfb8e --- /dev/null +++ b/contrib/build/stc/makefile.gcc @@ -0,0 +1,412 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +STCDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include -I..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I..\..\src\stc\..\..\..\src\tiff -I..\..\src\stc\..\..\..\src\jpeg -I..\..\src\stc\..\..\..\src\png -I..\..\src\stc\..\..\..\src\zlib -I..\..\src\stc\..\..\..\src\regex -I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS -DWXUSINGDLL -DWXMAKINGDLL_STC $(CXXFLAGS) +STCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include -I..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I..\..\src\stc\..\..\..\src\tiff -I..\..\src\stc\..\..\..\src\jpeg -I..\..\src\stc\..\..\..\src\png -I..\..\src\stc\..\..\..\src\zlib -I..\..\src\stc\..\..\..\src\regex -I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CXXFLAGS) + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(OFFICIAL_BUILD),0) +VENDORTAG = _$(VENDOR) +endif +ifeq ($(OFFICIAL_BUILD),1) +VENDORTAG = +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(SHARED),1) +__stcdll___depname = ..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll +endif +ifeq ($(SHARED),0) +__stclib___depname = ..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__stcdll___depname) $(__stclib___depname) + +$(OBJS)\stcdll_AutoComplete.o: ../../src/stc\scintilla\src\AutoComplete.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_CallTip.o: ../../src/stc\scintilla\src\CallTip.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_CellBuffer.o: ../../src/stc\scintilla\src\CellBuffer.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_ContractionState.o: ../../src/stc\scintilla\src\ContractionState.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_Document.o: ../../src/stc\scintilla\src\Document.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_DocumentAccessor.o: ../../src/stc\scintilla\src\DocumentAccessor.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_Editor.o: ../../src/stc\scintilla\src\Editor.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_ExternalLexer.o: ../../src/stc\scintilla\src\ExternalLexer.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_Indicator.o: ../../src/stc\scintilla\src\Indicator.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_KeyMap.o: ../../src/stc\scintilla\src\KeyMap.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_KeyWords.o: ../../src/stc\scintilla\src\KeyWords.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexAVE.o: ../../src/stc\scintilla\src\LexAVE.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexAda.o: ../../src/stc\scintilla\src\LexAda.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexAsm.o: ../../src/stc\scintilla\src\LexAsm.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexBaan.o: ../../src/stc\scintilla\src\LexBaan.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexBullant.o: ../../src/stc\scintilla\src\LexBullant.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexCPP.o: ../../src/stc\scintilla\src\LexCPP.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexCSS.o: ../../src/stc\scintilla\src\LexCSS.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexConf.o: ../../src/stc\scintilla\src\LexConf.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexCrontab.o: ../../src/stc\scintilla\src\LexCrontab.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexEScript.o: ../../src/stc\scintilla\src\LexEScript.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexEiffel.o: ../../src/stc\scintilla\src\LexEiffel.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexFortran.o: ../../src/stc\scintilla\src\LexFortran.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexHTML.o: ../../src/stc\scintilla\src\LexHTML.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexLisp.o: ../../src/stc\scintilla\src\LexLisp.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexLout.o: ../../src/stc\scintilla\src\LexLout.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexLua.o: ../../src/stc\scintilla\src\LexLua.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexMatlab.o: ../../src/stc\scintilla\src\LexMatlab.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexOthers.o: ../../src/stc\scintilla\src\LexOthers.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexPOV.o: ../../src/stc\scintilla\src\LexPOV.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexPascal.o: ../../src/stc\scintilla\src\LexPascal.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexPerl.o: ../../src/stc\scintilla\src\LexPerl.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexPython.o: ../../src/stc\scintilla\src\LexPython.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexRuby.o: ../../src/stc\scintilla\src\LexRuby.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexSQL.o: ../../src/stc\scintilla\src\LexSQL.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexVB.o: ../../src/stc\scintilla\src\LexVB.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LineMarker.o: ../../src/stc\scintilla\src\LineMarker.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_PlatWX.o: ../../src/stc\PlatWX.cpp + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_PropSet.o: ../../src/stc\scintilla\src\PropSet.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_RESearch.o: ../../src/stc\scintilla\src\RESearch.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_ScintillaBase.o: ../../src/stc\scintilla\src\ScintillaBase.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_ScintillaWX.o: ../../src/stc\ScintillaWX.cpp + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_Style.o: ../../src/stc\scintilla\src\Style.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_StyleContext.o: ../../src/stc\scintilla\src\StyleContext.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_UniConversion.o: ../../src/stc\scintilla\src\UniConversion.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_ViewStyle.o: ../../src/stc\scintilla\src\ViewStyle.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_WindowAccessor.o: ../../src/stc\scintilla\src\WindowAccessor.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_XPM.o: ../../src/stc\scintilla\src\XPM.cxx + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_dummy.o: ../../src/stc\..\..\..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_stc.o: ../../src/stc\stc.cpp + $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stclib_AutoComplete.o: ../../src/stc\scintilla\src\AutoComplete.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_CallTip.o: ../../src/stc\scintilla\src\CallTip.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_CellBuffer.o: ../../src/stc\scintilla\src\CellBuffer.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_ContractionState.o: ../../src/stc\scintilla\src\ContractionState.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_Document.o: ../../src/stc\scintilla\src\Document.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_DocumentAccessor.o: ../../src/stc\scintilla\src\DocumentAccessor.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_Editor.o: ../../src/stc\scintilla\src\Editor.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_ExternalLexer.o: ../../src/stc\scintilla\src\ExternalLexer.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_Indicator.o: ../../src/stc\scintilla\src\Indicator.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_KeyMap.o: ../../src/stc\scintilla\src\KeyMap.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_KeyWords.o: ../../src/stc\scintilla\src\KeyWords.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexAVE.o: ../../src/stc\scintilla\src\LexAVE.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexAda.o: ../../src/stc\scintilla\src\LexAda.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexAsm.o: ../../src/stc\scintilla\src\LexAsm.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexBaan.o: ../../src/stc\scintilla\src\LexBaan.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexBullant.o: ../../src/stc\scintilla\src\LexBullant.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexCPP.o: ../../src/stc\scintilla\src\LexCPP.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexCSS.o: ../../src/stc\scintilla\src\LexCSS.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexConf.o: ../../src/stc\scintilla\src\LexConf.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexCrontab.o: ../../src/stc\scintilla\src\LexCrontab.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexEScript.o: ../../src/stc\scintilla\src\LexEScript.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexEiffel.o: ../../src/stc\scintilla\src\LexEiffel.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexFortran.o: ../../src/stc\scintilla\src\LexFortran.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexHTML.o: ../../src/stc\scintilla\src\LexHTML.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexLisp.o: ../../src/stc\scintilla\src\LexLisp.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexLout.o: ../../src/stc\scintilla\src\LexLout.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexLua.o: ../../src/stc\scintilla\src\LexLua.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexMatlab.o: ../../src/stc\scintilla\src\LexMatlab.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexOthers.o: ../../src/stc\scintilla\src\LexOthers.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexPOV.o: ../../src/stc\scintilla\src\LexPOV.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexPascal.o: ../../src/stc\scintilla\src\LexPascal.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexPerl.o: ../../src/stc\scintilla\src\LexPerl.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexPython.o: ../../src/stc\scintilla\src\LexPython.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexRuby.o: ../../src/stc\scintilla\src\LexRuby.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexSQL.o: ../../src/stc\scintilla\src\LexSQL.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexVB.o: ../../src/stc\scintilla\src\LexVB.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LineMarker.o: ../../src/stc\scintilla\src\LineMarker.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_PlatWX.o: ../../src/stc\PlatWX.cpp + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_PropSet.o: ../../src/stc\scintilla\src\PropSet.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_RESearch.o: ../../src/stc\scintilla\src\RESearch.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_ScintillaBase.o: ../../src/stc\scintilla\src\ScintillaBase.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_ScintillaWX.o: ../../src/stc\ScintillaWX.cpp + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_Style.o: ../../src/stc\scintilla\src\Style.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_StyleContext.o: ../../src/stc\scintilla\src\StyleContext.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_UniConversion.o: ../../src/stc\scintilla\src\UniConversion.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_ViewStyle.o: ../../src/stc\scintilla\src\ViewStyle.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_WindowAccessor.o: ../../src/stc\scintilla\src\WindowAccessor.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_XPM.o: ../../src/stc\scintilla\src\XPM.cxx + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_dummy.o: ../../src/stc\..\..\..\src\msw\dummy.cpp + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_stc.o: ../../src/stc\stc.cpp + $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $< + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist ..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll del ..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll + -if exist ..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a del ..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a + -if exist ..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a del ..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a + +ifeq ($(SHARED),1) +..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll: $(OBJS)\stcdll_dummy.o $(OBJS)\stcdll_PlatWX.o $(OBJS)\stcdll_ScintillaWX.o $(OBJS)\stcdll_stc.o $(OBJS)\stcdll_AutoComplete.o $(OBJS)\stcdll_CallTip.o $(OBJS)\stcdll_CellBuffer.o $(OBJS)\stcdll_ContractionState.o $(OBJS)\stcdll_Document.o $(OBJS)\stcdll_DocumentAccessor.o $(OBJS)\stcdll_Editor.o $(OBJS)\stcdll_ExternalLexer.o $(OBJS)\stcdll_Indicator.o $(OBJS)\stcdll_KeyMap.o $(OBJS)\stcdll_KeyWords.o $(OBJS)\stcdll_LexAVE.o $(OBJS)\stcdll_LexAda.o $(OBJS)\stcdll_LexAsm.o $(OBJS)\stcdll_LexBaan.o $(OBJS)\stcdll_LexBullant.o $(OBJS)\stcdll_LexCPP.o $(OBJS)\stcdll_LexCSS.o $(OBJS)\stcdll_LexConf.o $(OBJS)\stcdll_LexCrontab.o $(OBJS)\stcdll_LexEiffel.o $(OBJS)\stcdll_LexEScript.o $(OBJS)\stcdll_LexFortran.o $(OBJS)\stcdll_LexHTML.o $(OBJS)\stcdll_LexLisp.o $(OBJS)\stcdll_LexLout.o $(OBJS)\stcdll_LexLua.o $(OBJS)\stcdll_LexMatlab.o $(OBJS)\stcdll_LexOthers.o $(OBJS)\stcdll_LexPOV.o $(OBJS)\stcdll_LexPascal.o $(OBJS)\stcdll_LexPerl.o $(OBJS)\stcdll_LexPython.o $(OBJS)\stcdll_LexRuby.o $(OBJS)\stcdll_LexSQL.o $(OBJS)\stcdll_LexVB.o $(OBJS)\stcdll_LineMarker.o $(OBJS)\stcdll_PropSet.o $(OBJS)\stcdll_RESearch.o $(OBJS)\stcdll_ScintillaBase.o $(OBJS)\stcdll_Style.o $(OBJS)\stcdll_StyleContext.o $(OBJS)\stcdll_UniConversion.o $(OBJS)\stcdll_ViewStyle.o $(OBJS)\stcdll_WindowAccessor.o $(OBJS)\stcdll_XPM.o + $(CXX) -shared -o $@ $(OBJS)\stcdll_dummy.o $(OBJS)\stcdll_PlatWX.o $(OBJS)\stcdll_ScintillaWX.o $(OBJS)\stcdll_stc.o $(OBJS)\stcdll_AutoComplete.o $(OBJS)\stcdll_CallTip.o $(OBJS)\stcdll_CellBuffer.o $(OBJS)\stcdll_ContractionState.o $(OBJS)\stcdll_Document.o $(OBJS)\stcdll_DocumentAccessor.o $(OBJS)\stcdll_Editor.o $(OBJS)\stcdll_ExternalLexer.o $(OBJS)\stcdll_Indicator.o $(OBJS)\stcdll_KeyMap.o $(OBJS)\stcdll_KeyWords.o $(OBJS)\stcdll_LexAVE.o $(OBJS)\stcdll_LexAda.o $(OBJS)\stcdll_LexAsm.o $(OBJS)\stcdll_LexBaan.o $(OBJS)\stcdll_LexBullant.o $(OBJS)\stcdll_LexCPP.o $(OBJS)\stcdll_LexCSS.o $(OBJS)\stcdll_LexConf.o $(OBJS)\stcdll_LexCrontab.o $(OBJS)\stcdll_LexEiffel.o $(OBJS)\stcdll_LexEScript.o $(OBJS)\stcdll_LexFortran.o $(OBJS)\stcdll_LexHTML.o $(OBJS)\stcdll_LexLisp.o $(OBJS)\stcdll_LexLout.o $(OBJS)\stcdll_LexLua.o $(OBJS)\stcdll_LexMatlab.o $(OBJS)\stcdll_LexOthers.o $(OBJS)\stcdll_LexPOV.o $(OBJS)\stcdll_LexPascal.o $(OBJS)\stcdll_LexPerl.o $(OBJS)\stcdll_LexPython.o $(OBJS)\stcdll_LexRuby.o $(OBJS)\stcdll_LexSQL.o $(OBJS)\stcdll_LexVB.o $(OBJS)\stcdll_LineMarker.o $(OBJS)\stcdll_PropSet.o $(OBJS)\stcdll_RESearch.o $(OBJS)\stcdll_ScintillaBase.o $(OBJS)\stcdll_Style.o $(OBJS)\stcdll_StyleContext.o $(OBJS)\stcdll_UniConversion.o $(OBJS)\stcdll_ViewStyle.o $(OBJS)\stcdll_WindowAccessor.o $(OBJS)\stcdll_XPM.o $(LDFLAGS) -Wl,--out-implib,..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a $(__DEBUGFLAG) -mthreads -L..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--out-implib,..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) +endif + +ifeq ($(SHARED),0) +..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a: $(OBJS)\stclib_dummy.o $(OBJS)\stclib_PlatWX.o $(OBJS)\stclib_ScintillaWX.o $(OBJS)\stclib_stc.o $(OBJS)\stclib_AutoComplete.o $(OBJS)\stclib_CallTip.o $(OBJS)\stclib_CellBuffer.o $(OBJS)\stclib_ContractionState.o $(OBJS)\stclib_Document.o $(OBJS)\stclib_DocumentAccessor.o $(OBJS)\stclib_Editor.o $(OBJS)\stclib_ExternalLexer.o $(OBJS)\stclib_Indicator.o $(OBJS)\stclib_KeyMap.o $(OBJS)\stclib_KeyWords.o $(OBJS)\stclib_LexAVE.o $(OBJS)\stclib_LexAda.o $(OBJS)\stclib_LexAsm.o $(OBJS)\stclib_LexBaan.o $(OBJS)\stclib_LexBullant.o $(OBJS)\stclib_LexCPP.o $(OBJS)\stclib_LexCSS.o $(OBJS)\stclib_LexConf.o $(OBJS)\stclib_LexCrontab.o $(OBJS)\stclib_LexEiffel.o $(OBJS)\stclib_LexEScript.o $(OBJS)\stclib_LexFortran.o $(OBJS)\stclib_LexHTML.o $(OBJS)\stclib_LexLisp.o $(OBJS)\stclib_LexLout.o $(OBJS)\stclib_LexLua.o $(OBJS)\stclib_LexMatlab.o $(OBJS)\stclib_LexOthers.o $(OBJS)\stclib_LexPOV.o $(OBJS)\stclib_LexPascal.o $(OBJS)\stclib_LexPerl.o $(OBJS)\stclib_LexPython.o $(OBJS)\stclib_LexRuby.o $(OBJS)\stclib_LexSQL.o $(OBJS)\stclib_LexVB.o $(OBJS)\stclib_LineMarker.o $(OBJS)\stclib_PropSet.o $(OBJS)\stclib_RESearch.o $(OBJS)\stclib_ScintillaBase.o $(OBJS)\stclib_Style.o $(OBJS)\stclib_StyleContext.o $(OBJS)\stclib_UniConversion.o $(OBJS)\stclib_ViewStyle.o $(OBJS)\stclib_WindowAccessor.o $(OBJS)\stclib_XPM.o + if exist $@ del $@ + ar rcu $@ $(OBJS)\stclib_dummy.o $(OBJS)\stclib_PlatWX.o $(OBJS)\stclib_ScintillaWX.o $(OBJS)\stclib_stc.o $(OBJS)\stclib_AutoComplete.o $(OBJS)\stclib_CallTip.o $(OBJS)\stclib_CellBuffer.o $(OBJS)\stclib_ContractionState.o $(OBJS)\stclib_Document.o $(OBJS)\stclib_DocumentAccessor.o $(OBJS)\stclib_Editor.o $(OBJS)\stclib_ExternalLexer.o $(OBJS)\stclib_Indicator.o $(OBJS)\stclib_KeyMap.o $(OBJS)\stclib_KeyWords.o $(OBJS)\stclib_LexAVE.o $(OBJS)\stclib_LexAda.o $(OBJS)\stclib_LexAsm.o $(OBJS)\stclib_LexBaan.o $(OBJS)\stclib_LexBullant.o $(OBJS)\stclib_LexCPP.o $(OBJS)\stclib_LexCSS.o $(OBJS)\stclib_LexConf.o $(OBJS)\stclib_LexCrontab.o $(OBJS)\stclib_LexEiffel.o $(OBJS)\stclib_LexEScript.o $(OBJS)\stclib_LexFortran.o $(OBJS)\stclib_LexHTML.o $(OBJS)\stclib_LexLisp.o $(OBJS)\stclib_LexLout.o $(OBJS)\stclib_LexLua.o $(OBJS)\stclib_LexMatlab.o $(OBJS)\stclib_LexOthers.o $(OBJS)\stclib_LexPOV.o $(OBJS)\stclib_LexPascal.o $(OBJS)\stclib_LexPerl.o $(OBJS)\stclib_LexPython.o $(OBJS)\stclib_LexRuby.o $(OBJS)\stclib_LexSQL.o $(OBJS)\stclib_LexVB.o $(OBJS)\stclib_LineMarker.o $(OBJS)\stclib_PropSet.o $(OBJS)\stclib_RESearch.o $(OBJS)\stclib_ScintillaBase.o $(OBJS)\stclib_Style.o $(OBJS)\stclib_StyleContext.o $(OBJS)\stclib_UniConversion.o $(OBJS)\stclib_ViewStyle.o $(OBJS)\stclib_WindowAccessor.o $(OBJS)\stclib_XPM.o + ranlib $@ +endif + +.PHONY: all clean diff --git a/contrib/build/stc/makefile.vc b/contrib/build/stc/makefile.vc new file mode 100644 index 0000000000..9ef1067e87 --- /dev/null +++ b/contrib/build/stc/makefile.vc @@ -0,0 +1,429 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +STCDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) $(__DEBUGFLAG) /Fd..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).pdb $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\stc\..\..\..\include /I..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\stc\..\..\..\src\tiff /I..\..\src\stc\..\..\..\src\jpeg /I..\..\src\stc\..\..\..\src\png /I..\..\src\stc\..\..\..\src\zlib /I..\..\src\stc\..\..\..\src\regex /Fp$(OBJS)\wxprec_stcdll.pch /I..\..\src\stc\..\..\include /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS /DWXUSINGDLL /DWXMAKINGDLL_STC $(CXXFLAGS) /Yuwx/wxprec.h +STCLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) $(__DEBUGFLAG) /Fd..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.pdb $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\stc\..\..\..\include /I..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\stc\..\..\..\src\tiff /I..\..\src\stc\..\..\..\src\jpeg /I..\..\src\stc\..\..\..\src\png /I..\..\src\stc\..\..\..\src\zlib /I..\..\src\stc\..\..\..\src\regex /Fp$(OBJS)\wxprec_stclib.pch /I..\..\src\stc\..\..\include /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS $(CXXFLAGS) /Yuwx/wxprec.h + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(OFFICIAL_BUILD)" == "0" +VENDORTAG = _$(VENDOR) +!endif +!if "$(OFFICIAL_BUILD)" == "1" +VENDORTAG = +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_3 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_3 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(SHARED)" == "1" +__stcdll___depname = ..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).dll +!endif +!if "$(SHARED)" == "0" +__stclib___depname = ..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__stcdll___depname) $(__stclib___depname) + +$(OBJS)\stcdll_AutoComplete.obj: ../../src/stc\scintilla\src\AutoComplete.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_CallTip.obj: ../../src/stc\scintilla\src\CallTip.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_CellBuffer.obj: ../../src/stc\scintilla\src\CellBuffer.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_ContractionState.obj: ../../src/stc\scintilla\src\ContractionState.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_Document.obj: ../../src/stc\scintilla\src\Document.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_DocumentAccessor.obj: ../../src/stc\scintilla\src\DocumentAccessor.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_Editor.obj: ../../src/stc\scintilla\src\Editor.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_ExternalLexer.obj: ../../src/stc\scintilla\src\ExternalLexer.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_Indicator.obj: ../../src/stc\scintilla\src\Indicator.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_KeyMap.obj: ../../src/stc\scintilla\src\KeyMap.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_KeyWords.obj: ../../src/stc\scintilla\src\KeyWords.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexAVE.obj: ../../src/stc\scintilla\src\LexAVE.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexAda.obj: ../../src/stc\scintilla\src\LexAda.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexAsm.obj: ../../src/stc\scintilla\src\LexAsm.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexBaan.obj: ../../src/stc\scintilla\src\LexBaan.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexBullant.obj: ../../src/stc\scintilla\src\LexBullant.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexCPP.obj: ../../src/stc\scintilla\src\LexCPP.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexCSS.obj: ../../src/stc\scintilla\src\LexCSS.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexConf.obj: ../../src/stc\scintilla\src\LexConf.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexCrontab.obj: ../../src/stc\scintilla\src\LexCrontab.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexEScript.obj: ../../src/stc\scintilla\src\LexEScript.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexEiffel.obj: ../../src/stc\scintilla\src\LexEiffel.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexFortran.obj: ../../src/stc\scintilla\src\LexFortran.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexHTML.obj: ../../src/stc\scintilla\src\LexHTML.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexLisp.obj: ../../src/stc\scintilla\src\LexLisp.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexLout.obj: ../../src/stc\scintilla\src\LexLout.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexLua.obj: ../../src/stc\scintilla\src\LexLua.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexMatlab.obj: ../../src/stc\scintilla\src\LexMatlab.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexOthers.obj: ../../src/stc\scintilla\src\LexOthers.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexPOV.obj: ../../src/stc\scintilla\src\LexPOV.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexPascal.obj: ../../src/stc\scintilla\src\LexPascal.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexPerl.obj: ../../src/stc\scintilla\src\LexPerl.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexPython.obj: ../../src/stc\scintilla\src\LexPython.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexRuby.obj: ../../src/stc\scintilla\src\LexRuby.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexSQL.obj: ../../src/stc\scintilla\src\LexSQL.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LexVB.obj: ../../src/stc\scintilla\src\LexVB.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_LineMarker.obj: ../../src/stc\scintilla\src\LineMarker.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_PlatWX.obj: ../../src/stc\PlatWX.cpp + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_PropSet.obj: ../../src/stc\scintilla\src\PropSet.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_RESearch.obj: ../../src/stc\scintilla\src\RESearch.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_ScintillaBase.obj: ../../src/stc\scintilla\src\ScintillaBase.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_ScintillaWX.obj: ../../src/stc\ScintillaWX.cpp + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_Style.obj: ../../src/stc\scintilla\src\Style.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_StyleContext.obj: ../../src/stc\scintilla\src\StyleContext.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_UniConversion.obj: ../../src/stc\scintilla\src\UniConversion.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_ViewStyle.obj: ../../src/stc\scintilla\src\ViewStyle.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_WindowAccessor.obj: ../../src/stc\scintilla\src\WindowAccessor.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_XPM.obj: ../../src/stc\scintilla\src\XPM.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stcdll_dummy.obj: ../../src/stc\..\..\..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\stcdll_stc.obj: ../../src/stc\stc.cpp + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + +$(OBJS)\stclib_AutoComplete.obj: ../../src/stc\scintilla\src\AutoComplete.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_CallTip.obj: ../../src/stc\scintilla\src\CallTip.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_CellBuffer.obj: ../../src/stc\scintilla\src\CellBuffer.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_ContractionState.obj: ../../src/stc\scintilla\src\ContractionState.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_Document.obj: ../../src/stc\scintilla\src\Document.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_DocumentAccessor.obj: ../../src/stc\scintilla\src\DocumentAccessor.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_Editor.obj: ../../src/stc\scintilla\src\Editor.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_ExternalLexer.obj: ../../src/stc\scintilla\src\ExternalLexer.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_Indicator.obj: ../../src/stc\scintilla\src\Indicator.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_KeyMap.obj: ../../src/stc\scintilla\src\KeyMap.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_KeyWords.obj: ../../src/stc\scintilla\src\KeyWords.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexAVE.obj: ../../src/stc\scintilla\src\LexAVE.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexAda.obj: ../../src/stc\scintilla\src\LexAda.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexAsm.obj: ../../src/stc\scintilla\src\LexAsm.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexBaan.obj: ../../src/stc\scintilla\src\LexBaan.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexBullant.obj: ../../src/stc\scintilla\src\LexBullant.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexCPP.obj: ../../src/stc\scintilla\src\LexCPP.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexCSS.obj: ../../src/stc\scintilla\src\LexCSS.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexConf.obj: ../../src/stc\scintilla\src\LexConf.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexCrontab.obj: ../../src/stc\scintilla\src\LexCrontab.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexEScript.obj: ../../src/stc\scintilla\src\LexEScript.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexEiffel.obj: ../../src/stc\scintilla\src\LexEiffel.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexFortran.obj: ../../src/stc\scintilla\src\LexFortran.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexHTML.obj: ../../src/stc\scintilla\src\LexHTML.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexLisp.obj: ../../src/stc\scintilla\src\LexLisp.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexLout.obj: ../../src/stc\scintilla\src\LexLout.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexLua.obj: ../../src/stc\scintilla\src\LexLua.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexMatlab.obj: ../../src/stc\scintilla\src\LexMatlab.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexOthers.obj: ../../src/stc\scintilla\src\LexOthers.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexPOV.obj: ../../src/stc\scintilla\src\LexPOV.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexPascal.obj: ../../src/stc\scintilla\src\LexPascal.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexPerl.obj: ../../src/stc\scintilla\src\LexPerl.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexPython.obj: ../../src/stc\scintilla\src\LexPython.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexRuby.obj: ../../src/stc\scintilla\src\LexRuby.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexSQL.obj: ../../src/stc\scintilla\src\LexSQL.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LexVB.obj: ../../src/stc\scintilla\src\LexVB.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_LineMarker.obj: ../../src/stc\scintilla\src\LineMarker.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_PlatWX.obj: ../../src/stc\PlatWX.cpp + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_PropSet.obj: ../../src/stc\scintilla\src\PropSet.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_RESearch.obj: ../../src/stc\scintilla\src\RESearch.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_ScintillaBase.obj: ../../src/stc\scintilla\src\ScintillaBase.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_ScintillaWX.obj: ../../src/stc\ScintillaWX.cpp + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_Style.obj: ../../src/stc\scintilla\src\Style.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_StyleContext.obj: ../../src/stc\scintilla\src\StyleContext.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_UniConversion.obj: ../../src/stc\scintilla\src\UniConversion.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_ViewStyle.obj: ../../src/stc\scintilla\src\ViewStyle.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_WindowAccessor.obj: ../../src/stc\scintilla\src\WindowAccessor.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_XPM.obj: ../../src/stc\scintilla\src\XPM.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +$(OBJS)\stclib_dummy.obj: ../../src/stc\..\..\..\src\msw\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) /Ycwx/wxprec.h $** + +$(OBJS)\stclib_stc.obj: ../../src/stc\stc.cpp + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist ..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).dll del ..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).dll + -if exist ..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del ..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib + -if exist ..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del ..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib + +!if "$(SHARED)" == "1" +..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).dll: $(OBJS)\stcdll_dummy.obj $(OBJS)\stcdll_dummy.obj $(OBJS)\stcdll_PlatWX.obj $(OBJS)\stcdll_ScintillaWX.obj $(OBJS)\stcdll_stc.obj $(OBJS)\stcdll_AutoComplete.obj $(OBJS)\stcdll_CallTip.obj $(OBJS)\stcdll_CellBuffer.obj $(OBJS)\stcdll_ContractionState.obj $(OBJS)\stcdll_Document.obj $(OBJS)\stcdll_DocumentAccessor.obj $(OBJS)\stcdll_Editor.obj $(OBJS)\stcdll_ExternalLexer.obj $(OBJS)\stcdll_Indicator.obj $(OBJS)\stcdll_KeyMap.obj $(OBJS)\stcdll_KeyWords.obj $(OBJS)\stcdll_LexAVE.obj $(OBJS)\stcdll_LexAda.obj $(OBJS)\stcdll_LexAsm.obj $(OBJS)\stcdll_LexBaan.obj $(OBJS)\stcdll_LexBullant.obj $(OBJS)\stcdll_LexCPP.obj $(OBJS)\stcdll_LexCSS.obj $(OBJS)\stcdll_LexConf.obj $(OBJS)\stcdll_LexCrontab.obj $(OBJS)\stcdll_LexEiffel.obj $(OBJS)\stcdll_LexEScript.obj $(OBJS)\stcdll_LexFortran.obj $(OBJS)\stcdll_LexHTML.obj $(OBJS)\stcdll_LexLisp.obj $(OBJS)\stcdll_LexLout.obj $(OBJS)\stcdll_LexLua.obj $(OBJS)\stcdll_LexMatlab.obj $(OBJS)\stcdll_LexOthers.obj $(OBJS)\stcdll_LexPOV.obj $(OBJS)\stcdll_LexPascal.obj $(OBJS)\stcdll_LexPerl.obj $(OBJS)\stcdll_LexPython.obj $(OBJS)\stcdll_LexRuby.obj $(OBJS)\stcdll_LexSQL.obj $(OBJS)\stcdll_LexVB.obj $(OBJS)\stcdll_LineMarker.obj $(OBJS)\stcdll_PropSet.obj $(OBJS)\stcdll_RESearch.obj $(OBJS)\stcdll_ScintillaBase.obj $(OBJS)\stcdll_Style.obj $(OBJS)\stcdll_StyleContext.obj $(OBJS)\stcdll_UniConversion.obj $(OBJS)\stcdll_ViewStyle.obj $(OBJS)\stcdll_WindowAccessor.obj $(OBJS)\stcdll_XPM.obj + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @<< + $(OBJS)\stcdll_dummy.obj $(OBJS)\stcdll_PlatWX.obj $(OBJS)\stcdll_ScintillaWX.obj $(OBJS)\stcdll_stc.obj $(OBJS)\stcdll_AutoComplete.obj $(OBJS)\stcdll_CallTip.obj $(OBJS)\stcdll_CellBuffer.obj $(OBJS)\stcdll_ContractionState.obj $(OBJS)\stcdll_Document.obj $(OBJS)\stcdll_DocumentAccessor.obj $(OBJS)\stcdll_Editor.obj $(OBJS)\stcdll_ExternalLexer.obj $(OBJS)\stcdll_Indicator.obj $(OBJS)\stcdll_KeyMap.obj $(OBJS)\stcdll_KeyWords.obj $(OBJS)\stcdll_LexAVE.obj $(OBJS)\stcdll_LexAda.obj $(OBJS)\stcdll_LexAsm.obj $(OBJS)\stcdll_LexBaan.obj $(OBJS)\stcdll_LexBullant.obj $(OBJS)\stcdll_LexCPP.obj $(OBJS)\stcdll_LexCSS.obj $(OBJS)\stcdll_LexConf.obj $(OBJS)\stcdll_LexCrontab.obj $(OBJS)\stcdll_LexEiffel.obj $(OBJS)\stcdll_LexEScript.obj $(OBJS)\stcdll_LexFortran.obj $(OBJS)\stcdll_LexHTML.obj $(OBJS)\stcdll_LexLisp.obj $(OBJS)\stcdll_LexLout.obj $(OBJS)\stcdll_LexLua.obj $(OBJS)\stcdll_LexMatlab.obj $(OBJS)\stcdll_LexOthers.obj $(OBJS)\stcdll_LexPOV.obj $(OBJS)\stcdll_LexPascal.obj $(OBJS)\stcdll_LexPerl.obj $(OBJS)\stcdll_LexPython.obj $(OBJS)\stcdll_LexRuby.obj $(OBJS)\stcdll_LexSQL.obj $(OBJS)\stcdll_LexVB.obj $(OBJS)\stcdll_LineMarker.obj $(OBJS)\stcdll_PropSet.obj $(OBJS)\stcdll_RESearch.obj $(OBJS)\stcdll_ScintillaBase.obj $(OBJS)\stcdll_Style.obj $(OBJS)\stcdll_StyleContext.obj $(OBJS)\stcdll_UniConversion.obj $(OBJS)\stcdll_ViewStyle.obj $(OBJS)\stcdll_WindowAccessor.obj $(OBJS)\stcdll_XPM.obj $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib +<< +!endif + +!if "$(SHARED)" == "0" +..\..\src\stc\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib: $(OBJS)\stclib_dummy.obj $(OBJS)\stclib_dummy.obj $(OBJS)\stclib_PlatWX.obj $(OBJS)\stclib_ScintillaWX.obj $(OBJS)\stclib_stc.obj $(OBJS)\stclib_AutoComplete.obj $(OBJS)\stclib_CallTip.obj $(OBJS)\stclib_CellBuffer.obj $(OBJS)\stclib_ContractionState.obj $(OBJS)\stclib_Document.obj $(OBJS)\stclib_DocumentAccessor.obj $(OBJS)\stclib_Editor.obj $(OBJS)\stclib_ExternalLexer.obj $(OBJS)\stclib_Indicator.obj $(OBJS)\stclib_KeyMap.obj $(OBJS)\stclib_KeyWords.obj $(OBJS)\stclib_LexAVE.obj $(OBJS)\stclib_LexAda.obj $(OBJS)\stclib_LexAsm.obj $(OBJS)\stclib_LexBaan.obj $(OBJS)\stclib_LexBullant.obj $(OBJS)\stclib_LexCPP.obj $(OBJS)\stclib_LexCSS.obj $(OBJS)\stclib_LexConf.obj $(OBJS)\stclib_LexCrontab.obj $(OBJS)\stclib_LexEiffel.obj $(OBJS)\stclib_LexEScript.obj $(OBJS)\stclib_LexFortran.obj $(OBJS)\stclib_LexHTML.obj $(OBJS)\stclib_LexLisp.obj $(OBJS)\stclib_LexLout.obj $(OBJS)\stclib_LexLua.obj $(OBJS)\stclib_LexMatlab.obj $(OBJS)\stclib_LexOthers.obj $(OBJS)\stclib_LexPOV.obj $(OBJS)\stclib_LexPascal.obj $(OBJS)\stclib_LexPerl.obj $(OBJS)\stclib_LexPython.obj $(OBJS)\stclib_LexRuby.obj $(OBJS)\stclib_LexSQL.obj $(OBJS)\stclib_LexVB.obj $(OBJS)\stclib_LineMarker.obj $(OBJS)\stclib_PropSet.obj $(OBJS)\stclib_RESearch.obj $(OBJS)\stclib_ScintillaBase.obj $(OBJS)\stclib_Style.obj $(OBJS)\stclib_StyleContext.obj $(OBJS)\stclib_UniConversion.obj $(OBJS)\stclib_ViewStyle.obj $(OBJS)\stclib_WindowAccessor.obj $(OBJS)\stclib_XPM.obj + if exist $@ del $@ + lib /NOLOGO /OUT:$@ @<< + $(OBJS)\stclib_dummy.obj $(OBJS)\stclib_PlatWX.obj $(OBJS)\stclib_ScintillaWX.obj $(OBJS)\stclib_stc.obj $(OBJS)\stclib_AutoComplete.obj $(OBJS)\stclib_CallTip.obj $(OBJS)\stclib_CellBuffer.obj $(OBJS)\stclib_ContractionState.obj $(OBJS)\stclib_Document.obj $(OBJS)\stclib_DocumentAccessor.obj $(OBJS)\stclib_Editor.obj $(OBJS)\stclib_ExternalLexer.obj $(OBJS)\stclib_Indicator.obj $(OBJS)\stclib_KeyMap.obj $(OBJS)\stclib_KeyWords.obj $(OBJS)\stclib_LexAVE.obj $(OBJS)\stclib_LexAda.obj $(OBJS)\stclib_LexAsm.obj $(OBJS)\stclib_LexBaan.obj $(OBJS)\stclib_LexBullant.obj $(OBJS)\stclib_LexCPP.obj $(OBJS)\stclib_LexCSS.obj $(OBJS)\stclib_LexConf.obj $(OBJS)\stclib_LexCrontab.obj $(OBJS)\stclib_LexEiffel.obj $(OBJS)\stclib_LexEScript.obj $(OBJS)\stclib_LexFortran.obj $(OBJS)\stclib_LexHTML.obj $(OBJS)\stclib_LexLisp.obj $(OBJS)\stclib_LexLout.obj $(OBJS)\stclib_LexLua.obj $(OBJS)\stclib_LexMatlab.obj $(OBJS)\stclib_LexOthers.obj $(OBJS)\stclib_LexPOV.obj $(OBJS)\stclib_LexPascal.obj $(OBJS)\stclib_LexPerl.obj $(OBJS)\stclib_LexPython.obj $(OBJS)\stclib_LexRuby.obj $(OBJS)\stclib_LexSQL.obj $(OBJS)\stclib_LexVB.obj $(OBJS)\stclib_LineMarker.obj $(OBJS)\stclib_PropSet.obj $(OBJS)\stclib_RESearch.obj $(OBJS)\stclib_ScintillaBase.obj $(OBJS)\stclib_Style.obj $(OBJS)\stclib_StyleContext.obj $(OBJS)\stclib_UniConversion.obj $(OBJS)\stclib_ViewStyle.obj $(OBJS)\stclib_WindowAccessor.obj $(OBJS)\stclib_XPM.obj +<< +!endif diff --git a/contrib/build/stc/makefile.wat b/contrib/build/stc/makefile.wat new file mode 100644 index 0000000000..2bdd295e00 --- /dev/null +++ b/contrib/build/stc/makefile.wat @@ -0,0 +1,466 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +VENDORTAG = +!ifeq OFFICIAL_BUILD 0 +VENDORTAG = _$(VENDOR) +!endif +!ifeq OFFICIAL_BUILD 1 +VENDORTAG = +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG = +!ifeq BUILD debug +__DEBUGFLAG = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__OPTIMIZEFLAG = +!ifeq BUILD debug +__OPTIMIZEFLAG = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG = -ot -ox +!endif +__RUNTIME_LIBS = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__stcdll___depname = +!ifeq SHARED 1 +__stcdll___depname = ..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_wat$(VENDORTAG).dll +!endif +__stclib___depname = +!ifeq SHARED 0 +__stclib___depname = ..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +STCDLL_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_stcdll.pch -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\stc\..\..\..\include -i=..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\stc\..\..\..\src\tiff -i=..\..\src\stc\..\..\..\src\jpeg -i=..\..\src\stc\..\..\..\src\png -i=..\..\src\stc\..\..\..\src\zlib -i=..\..\src\stc\..\..\..\src\regex -i=..\..\src\stc\..\..\include -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS -dWXUSINGDLL -dWXMAKINGDLL_STC $(CXXFLAGS) +STCLIB_CXXFLAGS = $(CPPFLAGS) /fh=$(OBJS)\wxprec_stclib.pch $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\stc\..\..\..\include -i=..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=..\..\src\stc\..\..\..\src\tiff -i=..\..\src\stc\..\..\..\src\jpeg -i=..\..\src\stc\..\..\..\src\png -i=..\..\src\stc\..\..\..\src\zlib -i=..\..\src\stc\..\..\..\src\regex -i=..\..\src\stc\..\..\include -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(__stcdll___depname) $(__stclib___depname) + +$(OBJS)\stcdll_AutoComplete.obj : .AUTODEPEND ../../src/stc\scintilla\src\AutoComplete.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_CallTip.obj : .AUTODEPEND ../../src/stc\scintilla\src\CallTip.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_CellBuffer.obj : .AUTODEPEND ../../src/stc\scintilla\src\CellBuffer.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_ContractionState.obj : .AUTODEPEND ../../src/stc\scintilla\src\ContractionState.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_Document.obj : .AUTODEPEND ../../src/stc\scintilla\src\Document.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_DocumentAccessor.obj : .AUTODEPEND ../../src/stc\scintilla\src\DocumentAccessor.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_Editor.obj : .AUTODEPEND ../../src/stc\scintilla\src\Editor.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_ExternalLexer.obj : .AUTODEPEND ../../src/stc\scintilla\src\ExternalLexer.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_Indicator.obj : .AUTODEPEND ../../src/stc\scintilla\src\Indicator.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_KeyMap.obj : .AUTODEPEND ../../src/stc\scintilla\src\KeyMap.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_KeyWords.obj : .AUTODEPEND ../../src/stc\scintilla\src\KeyWords.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexAVE.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexAVE.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexAda.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexAda.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexAsm.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexAsm.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexBaan.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexBaan.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexBullant.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexBullant.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexCPP.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexCPP.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexCSS.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexCSS.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexConf.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexConf.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexCrontab.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexCrontab.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexEScript.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexEScript.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexEiffel.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexEiffel.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexFortran.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexFortran.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexHTML.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexHTML.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexLisp.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexLisp.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexLout.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexLout.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexLua.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexLua.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexMatlab.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexMatlab.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexOthers.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexOthers.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexPOV.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexPOV.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexPascal.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexPascal.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexPerl.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexPerl.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexPython.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexPython.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexRuby.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexRuby.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexSQL.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexSQL.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LexVB.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexVB.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_LineMarker.obj : .AUTODEPEND ../../src/stc\scintilla\src\LineMarker.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_PlatWX.obj : .AUTODEPEND ../../src/stc\PlatWX.cpp + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_PropSet.obj : .AUTODEPEND ../../src/stc\scintilla\src\PropSet.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_RESearch.obj : .AUTODEPEND ../../src/stc\scintilla\src\RESearch.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_ScintillaBase.obj : .AUTODEPEND ../../src/stc\scintilla\src\ScintillaBase.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_ScintillaWX.obj : .AUTODEPEND ../../src/stc\ScintillaWX.cpp + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_Style.obj : .AUTODEPEND ../../src/stc\scintilla\src\Style.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_StyleContext.obj : .AUTODEPEND ../../src/stc\scintilla\src\StyleContext.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_UniConversion.obj : .AUTODEPEND ../../src/stc\scintilla\src\UniConversion.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_ViewStyle.obj : .AUTODEPEND ../../src/stc\scintilla\src\ViewStyle.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_WindowAccessor.obj : .AUTODEPEND ../../src/stc\scintilla\src\WindowAccessor.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_XPM.obj : .AUTODEPEND ../../src/stc\scintilla\src\XPM.cxx + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_dummy.obj : .AUTODEPEND ../../src/stc\..\..\..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stcdll_stc.obj : .AUTODEPEND ../../src/stc\stc.cpp + $(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< + +$(OBJS)\stclib_AutoComplete.obj : .AUTODEPEND ../../src/stc\scintilla\src\AutoComplete.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_CallTip.obj : .AUTODEPEND ../../src/stc\scintilla\src\CallTip.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_CellBuffer.obj : .AUTODEPEND ../../src/stc\scintilla\src\CellBuffer.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_ContractionState.obj : .AUTODEPEND ../../src/stc\scintilla\src\ContractionState.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_Document.obj : .AUTODEPEND ../../src/stc\scintilla\src\Document.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_DocumentAccessor.obj : .AUTODEPEND ../../src/stc\scintilla\src\DocumentAccessor.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_Editor.obj : .AUTODEPEND ../../src/stc\scintilla\src\Editor.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_ExternalLexer.obj : .AUTODEPEND ../../src/stc\scintilla\src\ExternalLexer.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_Indicator.obj : .AUTODEPEND ../../src/stc\scintilla\src\Indicator.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_KeyMap.obj : .AUTODEPEND ../../src/stc\scintilla\src\KeyMap.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_KeyWords.obj : .AUTODEPEND ../../src/stc\scintilla\src\KeyWords.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexAVE.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexAVE.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexAda.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexAda.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexAsm.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexAsm.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexBaan.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexBaan.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexBullant.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexBullant.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexCPP.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexCPP.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexCSS.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexCSS.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexConf.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexConf.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexCrontab.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexCrontab.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexEScript.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexEScript.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexEiffel.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexEiffel.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexFortran.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexFortran.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexHTML.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexHTML.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexLisp.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexLisp.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexLout.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexLout.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexLua.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexLua.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexMatlab.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexMatlab.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexOthers.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexOthers.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexPOV.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexPOV.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexPascal.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexPascal.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexPerl.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexPerl.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexPython.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexPython.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexRuby.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexRuby.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexSQL.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexSQL.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LexVB.obj : .AUTODEPEND ../../src/stc\scintilla\src\LexVB.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_LineMarker.obj : .AUTODEPEND ../../src/stc\scintilla\src\LineMarker.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_PlatWX.obj : .AUTODEPEND ../../src/stc\PlatWX.cpp + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_PropSet.obj : .AUTODEPEND ../../src/stc\scintilla\src\PropSet.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_RESearch.obj : .AUTODEPEND ../../src/stc\scintilla\src\RESearch.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_ScintillaBase.obj : .AUTODEPEND ../../src/stc\scintilla\src\ScintillaBase.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_ScintillaWX.obj : .AUTODEPEND ../../src/stc\ScintillaWX.cpp + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_Style.obj : .AUTODEPEND ../../src/stc\scintilla\src\Style.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_StyleContext.obj : .AUTODEPEND ../../src/stc\scintilla\src\StyleContext.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_UniConversion.obj : .AUTODEPEND ../../src/stc\scintilla\src\UniConversion.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_ViewStyle.obj : .AUTODEPEND ../../src/stc\scintilla\src\ViewStyle.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_WindowAccessor.obj : .AUTODEPEND ../../src/stc\scintilla\src\WindowAccessor.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_XPM.obj : .AUTODEPEND ../../src/stc\scintilla\src\XPM.cxx + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_dummy.obj : .AUTODEPEND ../../src/stc\..\..\..\src\msw\dummy.cpp + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +$(OBJS)\stclib_stc.obj : .AUTODEPEND ../../src/stc\stc.cpp + $(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist ..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_wat$(VENDORTAG).dll del ..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_wat$(VENDORTAG).dll + -if exist ..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del ..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib + -if exist ..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del ..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib + +!ifeq SHARED 1 +..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_wat$(VENDORTAG).dll : $(OBJS)\stcdll_dummy.obj $(OBJS)\stcdll_PlatWX.obj $(OBJS)\stcdll_ScintillaWX.obj $(OBJS)\stcdll_stc.obj $(OBJS)\stcdll_AutoComplete.obj $(OBJS)\stcdll_CallTip.obj $(OBJS)\stcdll_CellBuffer.obj $(OBJS)\stcdll_ContractionState.obj $(OBJS)\stcdll_Document.obj $(OBJS)\stcdll_DocumentAccessor.obj $(OBJS)\stcdll_Editor.obj $(OBJS)\stcdll_ExternalLexer.obj $(OBJS)\stcdll_Indicator.obj $(OBJS)\stcdll_KeyMap.obj $(OBJS)\stcdll_KeyWords.obj $(OBJS)\stcdll_LexAVE.obj $(OBJS)\stcdll_LexAda.obj $(OBJS)\stcdll_LexAsm.obj $(OBJS)\stcdll_LexBaan.obj $(OBJS)\stcdll_LexBullant.obj $(OBJS)\stcdll_LexCPP.obj $(OBJS)\stcdll_LexCSS.obj $(OBJS)\stcdll_LexConf.obj $(OBJS)\stcdll_LexCrontab.obj $(OBJS)\stcdll_LexEiffel.obj $(OBJS)\stcdll_LexEScript.obj $(OBJS)\stcdll_LexFortran.obj $(OBJS)\stcdll_LexHTML.obj $(OBJS)\stcdll_LexLisp.obj $(OBJS)\stcdll_LexLout.obj $(OBJS)\stcdll_LexLua.obj $(OBJS)\stcdll_LexMatlab.obj $(OBJS)\stcdll_LexOthers.obj $(OBJS)\stcdll_LexPOV.obj $(OBJS)\stcdll_LexPascal.obj $(OBJS)\stcdll_LexPerl.obj $(OBJS)\stcdll_LexPython.obj $(OBJS)\stcdll_LexRuby.obj $(OBJS)\stcdll_LexSQL.obj $(OBJS)\stcdll_LexVB.obj $(OBJS)\stcdll_LineMarker.obj $(OBJS)\stcdll_PropSet.obj $(OBJS)\stcdll_RESearch.obj $(OBJS)\stcdll_ScintillaBase.obj $(OBJS)\stcdll_Style.obj $(OBJS)\stcdll_StyleContext.obj $(OBJS)\stcdll_UniConversion.obj $(OBJS)\stcdll_ViewStyle.obj $(OBJS)\stcdll_WindowAccessor.obj $(OBJS)\stcdll_XPM.obj + @%create $(OBJS)\stcdll.lbc + @%append $(OBJS)\stcdll.lbc option quiet + @%append $(OBJS)\stcdll.lbc name $^@ + @%append $(OBJS)\stcdll.lbc option incremental + @%append $(OBJS)\stcdll.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath ..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + @for %i in ( $(OBJS)\stcdll_dummy.obj $(OBJS)\stcdll_PlatWX.obj $(OBJS)\stcdll_ScintillaWX.obj $(OBJS)\stcdll_stc.obj $(OBJS)\stcdll_AutoComplete.obj $(OBJS)\stcdll_CallTip.obj $(OBJS)\stcdll_CellBuffer.obj $(OBJS)\stcdll_ContractionState.obj $(OBJS)\stcdll_Document.obj $(OBJS)\stcdll_DocumentAccessor.obj $(OBJS)\stcdll_Editor.obj $(OBJS)\stcdll_ExternalLexer.obj $(OBJS)\stcdll_Indicator.obj $(OBJS)\stcdll_KeyMap.obj $(OBJS)\stcdll_KeyWords.obj $(OBJS)\stcdll_LexAVE.obj $(OBJS)\stcdll_LexAda.obj $(OBJS)\stcdll_LexAsm.obj $(OBJS)\stcdll_LexBaan.obj $(OBJS)\stcdll_LexBullant.obj $(OBJS)\stcdll_LexCPP.obj $(OBJS)\stcdll_LexCSS.obj $(OBJS)\stcdll_LexConf.obj $(OBJS)\stcdll_LexCrontab.obj $(OBJS)\stcdll_LexEiffel.obj $(OBJS)\stcdll_LexEScript.obj $(OBJS)\stcdll_LexFortran.obj $(OBJS)\stcdll_LexHTML.obj $(OBJS)\stcdll_LexLisp.obj $(OBJS)\stcdll_LexLout.obj $(OBJS)\stcdll_LexLua.obj $(OBJS)\stcdll_LexMatlab.obj $(OBJS)\stcdll_LexOthers.obj $(OBJS)\stcdll_LexPOV.obj $(OBJS)\stcdll_LexPascal.obj $(OBJS)\stcdll_LexPerl.obj $(OBJS)\stcdll_LexPython.obj $(OBJS)\stcdll_LexRuby.obj $(OBJS)\stcdll_LexSQL.obj $(OBJS)\stcdll_LexVB.obj $(OBJS)\stcdll_LineMarker.obj $(OBJS)\stcdll_PropSet.obj $(OBJS)\stcdll_RESearch.obj $(OBJS)\stcdll_ScintillaBase.obj $(OBJS)\stcdll_Style.obj $(OBJS)\stcdll_StyleContext.obj $(OBJS)\stcdll_UniConversion.obj $(OBJS)\stcdll_ViewStyle.obj $(OBJS)\stcdll_WindowAccessor.obj $(OBJS)\stcdll_XPM.obj) do @%append $(OBJS)\stcdll.lbc file %i + @for %i in ( $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\stcdll.lbc library %i + @%append $(OBJS)\stcdll.lbc + @%append $(OBJS)\stcdll.lbc system nt_dll + wlink @$(OBJS)\stcdll.lbc + wlib -q -n -b ..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib +$^@ +!endif + +!ifeq SHARED 0 +..\..\src\stc\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib : $(OBJS)\stclib_dummy.obj $(OBJS)\stclib_PlatWX.obj $(OBJS)\stclib_ScintillaWX.obj $(OBJS)\stclib_stc.obj $(OBJS)\stclib_AutoComplete.obj $(OBJS)\stclib_CallTip.obj $(OBJS)\stclib_CellBuffer.obj $(OBJS)\stclib_ContractionState.obj $(OBJS)\stclib_Document.obj $(OBJS)\stclib_DocumentAccessor.obj $(OBJS)\stclib_Editor.obj $(OBJS)\stclib_ExternalLexer.obj $(OBJS)\stclib_Indicator.obj $(OBJS)\stclib_KeyMap.obj $(OBJS)\stclib_KeyWords.obj $(OBJS)\stclib_LexAVE.obj $(OBJS)\stclib_LexAda.obj $(OBJS)\stclib_LexAsm.obj $(OBJS)\stclib_LexBaan.obj $(OBJS)\stclib_LexBullant.obj $(OBJS)\stclib_LexCPP.obj $(OBJS)\stclib_LexCSS.obj $(OBJS)\stclib_LexConf.obj $(OBJS)\stclib_LexCrontab.obj $(OBJS)\stclib_LexEiffel.obj $(OBJS)\stclib_LexEScript.obj $(OBJS)\stclib_LexFortran.obj $(OBJS)\stclib_LexHTML.obj $(OBJS)\stclib_LexLisp.obj $(OBJS)\stclib_LexLout.obj $(OBJS)\stclib_LexLua.obj $(OBJS)\stclib_LexMatlab.obj $(OBJS)\stclib_LexOthers.obj $(OBJS)\stclib_LexPOV.obj $(OBJS)\stclib_LexPascal.obj $(OBJS)\stclib_LexPerl.obj $(OBJS)\stclib_LexPython.obj $(OBJS)\stclib_LexRuby.obj $(OBJS)\stclib_LexSQL.obj $(OBJS)\stclib_LexVB.obj $(OBJS)\stclib_LineMarker.obj $(OBJS)\stclib_PropSet.obj $(OBJS)\stclib_RESearch.obj $(OBJS)\stclib_ScintillaBase.obj $(OBJS)\stclib_Style.obj $(OBJS)\stclib_StyleContext.obj $(OBJS)\stclib_UniConversion.obj $(OBJS)\stclib_ViewStyle.obj $(OBJS)\stclib_WindowAccessor.obj $(OBJS)\stclib_XPM.obj + @%create $(OBJS)\stclib.lbc + @for %i in ( $(OBJS)\stclib_dummy.obj $(OBJS)\stclib_PlatWX.obj $(OBJS)\stclib_ScintillaWX.obj $(OBJS)\stclib_stc.obj $(OBJS)\stclib_AutoComplete.obj $(OBJS)\stclib_CallTip.obj $(OBJS)\stclib_CellBuffer.obj $(OBJS)\stclib_ContractionState.obj $(OBJS)\stclib_Document.obj $(OBJS)\stclib_DocumentAccessor.obj $(OBJS)\stclib_Editor.obj $(OBJS)\stclib_ExternalLexer.obj $(OBJS)\stclib_Indicator.obj $(OBJS)\stclib_KeyMap.obj $(OBJS)\stclib_KeyWords.obj $(OBJS)\stclib_LexAVE.obj $(OBJS)\stclib_LexAda.obj $(OBJS)\stclib_LexAsm.obj $(OBJS)\stclib_LexBaan.obj $(OBJS)\stclib_LexBullant.obj $(OBJS)\stclib_LexCPP.obj $(OBJS)\stclib_LexCSS.obj $(OBJS)\stclib_LexConf.obj $(OBJS)\stclib_LexCrontab.obj $(OBJS)\stclib_LexEiffel.obj $(OBJS)\stclib_LexEScript.obj $(OBJS)\stclib_LexFortran.obj $(OBJS)\stclib_LexHTML.obj $(OBJS)\stclib_LexLisp.obj $(OBJS)\stclib_LexLout.obj $(OBJS)\stclib_LexLua.obj $(OBJS)\stclib_LexMatlab.obj $(OBJS)\stclib_LexOthers.obj $(OBJS)\stclib_LexPOV.obj $(OBJS)\stclib_LexPascal.obj $(OBJS)\stclib_LexPerl.obj $(OBJS)\stclib_LexPython.obj $(OBJS)\stclib_LexRuby.obj $(OBJS)\stclib_LexSQL.obj $(OBJS)\stclib_LexVB.obj $(OBJS)\stclib_LineMarker.obj $(OBJS)\stclib_PropSet.obj $(OBJS)\stclib_RESearch.obj $(OBJS)\stclib_ScintillaBase.obj $(OBJS)\stclib_Style.obj $(OBJS)\stclib_StyleContext.obj $(OBJS)\stclib_UniConversion.obj $(OBJS)\stclib_ViewStyle.obj $(OBJS)\stclib_WindowAccessor.obj $(OBJS)\stclib_XPM.obj) do @%append $(OBJS)\stclib.lbc +%i + wlib -q -p2048 -n -b $^@ @$(OBJS)\stclib.lbc +!endif diff --git a/contrib/build/xrc/makefile.bcc b/contrib/build/xrc/makefile.bcc index 7308c40018..88fa7afca3 100644 --- a/contrib/build/xrc/makefile.bcc +++ b/contrib/build/xrc/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -411,7 +411,7 @@ clean: !if "$(SHARED)" == "1" ..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_bcc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_xmlparse.obj $(OBJS)\xrcdll_xmltok.obj $(OBJS)\xrcdll_xmlrole.obj $(OBJS)\xrcdll_xml.obj $(OBJS)\xrcdll_xmlres.obj $(OBJS)\xrcdll_xh_bmp.obj $(OBJS)\xrcdll_xh_bmpbt.obj $(OBJS)\xrcdll_xh_bttn.obj $(OBJS)\xrcdll_xh_cald.obj $(OBJS)\xrcdll_xh_chckb.obj $(OBJS)\xrcdll_xh_chckl.obj $(OBJS)\xrcdll_xh_choic.obj $(OBJS)\xrcdll_xh_combo.obj $(OBJS)\xrcdll_xh_dlg.obj $(OBJS)\xrcdll_xh_frame.obj $(OBJS)\xrcdll_xh_gauge.obj $(OBJS)\xrcdll_xh_gdctl.obj $(OBJS)\xrcdll_xh_html.obj $(OBJS)\xrcdll_xh_listb.obj $(OBJS)\xrcdll_xh_listc.obj $(OBJS)\xrcdll_xh_menu.obj $(OBJS)\xrcdll_xh_notbk.obj $(OBJS)\xrcdll_xh_panel.obj $(OBJS)\xrcdll_xh_radbt.obj $(OBJS)\xrcdll_xh_radbx.obj $(OBJS)\xrcdll_xh_scrol.obj $(OBJS)\xrcdll_xh_scwin.obj $(OBJS)\xrcdll_xh_sizer.obj $(OBJS)\xrcdll_xh_slidr.obj $(OBJS)\xrcdll_xh_spin.obj $(OBJS)\xrcdll_xh_split.obj $(OBJS)\xrcdll_xh_stbmp.obj $(OBJS)\xrcdll_xh_stbox.obj $(OBJS)\xrcdll_xh_stlin.obj $(OBJS)\xrcdll_xh_sttxt.obj $(OBJS)\xrcdll_xh_text.obj $(OBJS)\xrcdll_xh_toolb.obj $(OBJS)\xrcdll_xh_tree.obj $(OBJS)\xrcdll_xh_unkwn.obj $(OBJS)\xrcdll_xh_wizrd.obj $(OBJS)\xrcdll_xmlrsall.obj - ilink32 -Tpd $(LDFLAGS) $(__DEBUGFLAG) -L..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| + ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&| c0d32.obj $(OBJS)\xrcdll_dummy.obj $(OBJS)\xrcdll_xmlparse.obj $(OBJS)\xrcdll_xmltok.obj $(OBJS)\xrcdll_xmlrole.obj $(OBJS)\xrcdll_xml.obj $(OBJS)\xrcdll_xmlres.obj $(OBJS)\xrcdll_xh_bmp.obj $(OBJS)\xrcdll_xh_bmpbt.obj $(OBJS)\xrcdll_xh_bttn.obj $(OBJS)\xrcdll_xh_cald.obj $(OBJS)\xrcdll_xh_chckb.obj $(OBJS)\xrcdll_xh_chckl.obj $(OBJS)\xrcdll_xh_choic.obj $(OBJS)\xrcdll_xh_combo.obj $(OBJS)\xrcdll_xh_dlg.obj $(OBJS)\xrcdll_xh_frame.obj $(OBJS)\xrcdll_xh_gauge.obj $(OBJS)\xrcdll_xh_gdctl.obj $(OBJS)\xrcdll_xh_html.obj $(OBJS)\xrcdll_xh_listb.obj $(OBJS)\xrcdll_xh_listc.obj $(OBJS)\xrcdll_xh_menu.obj $(OBJS)\xrcdll_xh_notbk.obj $(OBJS)\xrcdll_xh_panel.obj $(OBJS)\xrcdll_xh_radbt.obj $(OBJS)\xrcdll_xh_radbx.obj $(OBJS)\xrcdll_xh_scrol.obj $(OBJS)\xrcdll_xh_scwin.obj $(OBJS)\xrcdll_xh_sizer.obj $(OBJS)\xrcdll_xh_slidr.obj $(OBJS)\xrcdll_xh_spin.obj $(OBJS)\xrcdll_xh_split.obj $(OBJS)\xrcdll_xh_stbmp.obj $(OBJS)\xrcdll_xh_stbox.obj $(OBJS)\xrcdll_xh_stlin.obj $(OBJS)\xrcdll_xh_sttxt.obj $(OBJS)\xrcdll_xh_text.obj $(OBJS)\xrcdll_xh_toolb.obj $(OBJS)\xrcdll_xh_tree.obj $(OBJS)\xrcdll_xh_unkwn.obj $(OBJS)\xrcdll_xh_wizrd.obj $(OBJS)\xrcdll_xmlrsall.obj,$@,, $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,, | implib -f ..\..\src\xrc\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc $@ diff --git a/contrib/build/xrc/makefile.gcc b/contrib/build/xrc/makefile.gcc index e78a5849f8..2f696e8a70 100644 --- a/contrib/build/xrc/makefile.gcc +++ b/contrib/build/xrc/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/contrib/build/xrc/makefile.vc b/contrib/build/xrc/makefile.vc index 41cd343b62..e12e006a6f 100644 --- a/contrib/build/xrc/makefile.vc +++ b/contrib/build/xrc/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/contrib/build/xrc/makefile.wat b/contrib/build/xrc/makefile.wat index 991ac13cff..0a980420e7 100644 --- a/contrib/build/xrc/makefile.wat +++ b/contrib/build/xrc/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/contrib/samples/animate/Makefile.in b/contrib/samples/animate/Makefile.in index 231e8ab97f..56ea22d736 100644 --- a/contrib/samples/animate/Makefile.in +++ b/contrib/samples/animate/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -ANITEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../include $(CXXFLAGS) +ANITEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + -I$(srcdir)/../../include $(CXXFLAGS) ### Conditionally set variables: ### @@ -56,27 +61,44 @@ ANITEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i $(srcdir)/../../include -o anitest$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -i $(srcdir)/../../include -o \ +@COND_TOOLKIT_MAC@ anitest$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__anitest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__anitest___mac_setfilecmd = $(SETFILE) -a C anitest$(EXEEXT) +@COND_PLATFORM_MAC_1@__anitest___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C anitest$(EXEEXT) ### Targets: ### all: anitest$(EXEEXT) data anitest$(EXEEXT): anitest_anitest.o - $(CXX) -o $@ anitest_anitest.o $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ anitest_anitest.o $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__anitest___mac_rezcmd) $(__anitest___mac_setfilecmd) diff --git a/contrib/samples/animate/makefile.bcc b/contrib/samples/animate/makefile.bcc new file mode 100644 index 0000000000..64f4e40776 --- /dev/null +++ b/contrib/samples/animate/makefile.bcc @@ -0,0 +1,125 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +ANITEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ + -I.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ + -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) \ + -I.\..\..\include $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\anitest.exe data + +$(OBJS)\anitest_anitest.obj: .\anitest.cpp + $(CXX) -q -c -P -o$@ $(ANITEST_CXXFLAGS) $** + +$(OBJS)\anitest.exe: $(OBJS)\anitest_anitest.obj + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\anitest_anitest.obj,$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, +| + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\anitest.exe del $(OBJS)\anitest.exe + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (bttrfly.gif hooked.gif tbttrfly.gif mondrian.ico) do if not exist $(OBJS)\%f copy .\%f $(OBJS) diff --git a/contrib/samples/animate/makefile.gcc b/contrib/samples/animate/makefile.gcc new file mode 100644 index 0000000000..5b505f251b --- /dev/null +++ b/contrib/samples/animate/makefile.gcc @@ -0,0 +1,98 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +ANITEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS) +OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +ifeq ($(SHARED),1) +__DLLFLAG_p = -DWXUSINGDLL +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\anitest.exe data + +$(OBJS)\anitest_anitest.o: .\anitest.cpp + $(CXX) -c -o $@ $(ANITEST_CXXFLAGS) $< + +$(OBJS)\anitest.exe: $(OBJS)\anitest_anitest.o + $(CXX) -o $@ $(OBJS)\anitest_anitest.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist $(OBJS)\anitest.exe del $(OBJS)\anitest.exe + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %%f in (bttrfly.gif hooked.gif tbttrfly.gif mondrian.ico) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) + +.PHONY: all clean diff --git a/contrib/samples/animate/makefile.vc b/contrib/samples/animate/makefile.vc index aadb452bc9..abe2971867 100644 --- a/contrib/samples/animate/makefile.vc +++ b/contrib/samples/animate/makefile.vc @@ -1,13 +1,114 @@ -WXDIR = $(WXWIN) -PROGRAM = anitest +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= -OBJECTS = $(PROGRAM).obj -!if "$(FINAL)" == "0" -EXTRALIBS=$(WXDIR)\lib\animd.lib -!else -EXTRALIBS=$(WXDIR)\lib\anim.lib +!include <../../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +ANITEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\anitest.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I. $(__DLLFLAG_p) /I.\..\..\include $(CXXFLAGS) +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ !endif -EXTRAINC = -I$(WXDIR)\contrib\include +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\anitest.exe data + +$(OBJS)\anitest_anitest.obj: .\anitest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ANITEST_CXXFLAGS) $** + +$(OBJS)\anitest.exe: $(OBJS)\anitest_anitest.obj + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\anitest_anitest.obj wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib +<< -!include $(WXDIR)\src\makeprog.vc +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\anitest.exe del $(OBJS)\anitest.exe +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (bttrfly.gif hooked.gif tbttrfly.gif mondrian.ico) do if not exist $(OBJS)\%f copy .\%f $(OBJS) diff --git a/contrib/samples/animate/makefile.wat b/contrib/samples/animate/makefile.wat index bbf34b15d6..e01fc34d0e 100644 --- a/contrib/samples/animate/makefile.wat +++ b/contrib/samples/animate/makefile.wat @@ -1,17 +1,148 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= -WXDIR = $(%WXWIN) -EXTRACPPFLAGS = -I$(WXDIR)\contrib\include +!include ../../../build/config.wat -PROGRAM = anitest -EXTRALIBS = $(WXDIR)\lib\anim_w.lib -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- -!include $(WXDIR)\src\makeprog.wat +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +ANITEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=. $(__DLLFLAG_p) -i=.\..\..\include $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\anitest.exe data + +$(OBJS)\anitest_anitest.obj : .AUTODEPEND .\anitest.cpp + $(CXX) -zq -fo=$^@ $(ANITEST_CXXFLAGS) $< + +$(OBJS)\anitest.exe : $(OBJS)\anitest_anitest.obj + @%create $(OBJS)\anitest.lbc + @%append $(OBJS)\anitest.lbc option quiet + @%append $(OBJS)\anitest.lbc name $^@ + @%append $(OBJS)\anitest.lbc option incremental + @%append $(OBJS)\anitest.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\anitest_anitest.obj) do @%append $(OBJS)\anitest.lbc file %i + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\anitest.lbc library %i + @%append $(OBJS)\anitest.lbc + wlink @$(OBJS)\anitest.lbc + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\anitest.exe del $(OBJS)\anitest.exe + +data : + if not exist $(OBJS) mkdir $(OBJS) + for %f in (bttrfly.gif hooked.gif tbttrfly.gif mondrian.ico) do if not exist $(OBJS)\%f copy .\%f $(OBJS) diff --git a/contrib/samples/xrc/Makefile.in b/contrib/samples/xrc/Makefile.in index 1f19d33627..02954952ed 100644 --- a/contrib/samples/xrc/Makefile.in +++ b/contrib/samples/xrc/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -XRCDEMO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../include $(CXXFLAGS) +XRCDEMO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + -I$(srcdir)/../../include $(CXXFLAGS) ### Conditionally set variables: ### @@ -44,33 +49,66 @@ XRCDEMO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_WXUNIV_1@WXUNIVNAME = univ @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i $(srcdir)/../../include -o xrcdemo$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_0@__WXLIB_HTML_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -i $(srcdir)/../../include -o \ +@COND_TOOLKIT_MAC@ xrcdemo$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_HTML_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__xrcdemo___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__xrcdemo___mac_setfilecmd = $(SETFILE) -a C xrcdemo$(EXEEXT) +@COND_PLATFORM_MAC_1@__xrcdemo___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C xrcdemo$(EXEEXT) +@COND_PLATFORM_WIN32_1@__xrcdemo___win32rc = xrcdemo_xrcdemo_rc.o ### Targets: ### @@ -99,8 +137,8 @@ install-strip: install uninstall: -xrcdemo$(EXEEXT): xrcdemo_xrcdemo.o xrcdemo_myframe.o xrcdemo_derivdlg.o xrcdemo_custclas.o - $(CXX) -o $@ xrcdemo_xrcdemo.o xrcdemo_myframe.o xrcdemo_derivdlg.o xrcdemo_custclas.o $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5 $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) +xrcdemo$(EXEEXT): xrcdemo_xrcdemo.o xrcdemo_myframe.o xrcdemo_derivdlg.o xrcdemo_custclas.o $(__xrcdemo___win32rc) + $(CXX) -o $@ xrcdemo_xrcdemo.o xrcdemo_myframe.o xrcdemo_derivdlg.o xrcdemo_custclas.o $(__xrcdemo___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__xrcdemo___mac_rezcmd) $(__xrcdemo___mac_setfilecmd) @@ -116,6 +154,9 @@ xrcdemo_myframe.o: $(srcdir)/myframe.cpp xrcdemo_xrcdemo.o: $(srcdir)/xrcdemo.cpp $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $< +xrcdemo_xrcdemo_rc.o: $(srcdir)/xrcdemo.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../include + # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d diff --git a/contrib/samples/xrc/makefile.bcc b/contrib/samples/xrc/makefile.bcc new file mode 100644 index 0000000000..4c792175fa --- /dev/null +++ b/contrib/samples/xrc/makefile.bcc @@ -0,0 +1,153 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ + -I.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ + -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) \ + -I.\..\..\include $(CXXFLAGS) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\xrcdemo.exe data + +$(OBJS)\xrcdemo_custclas.obj: .\custclas.cpp + $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) $** + +$(OBJS)\xrcdemo_derivdlg.obj: .\derivdlg.cpp + $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) $** + +$(OBJS)\xrcdemo_myframe.obj: .\myframe.cpp + $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) $** + +$(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp + $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) $** + +$(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib -i.\..\..\..\src\regex -i. $(__DLLFLAG_p_1) -i.\..\..\include $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe + +data: + if not exist $(OBJS)/rc mkdir $(OBJS)/rc + for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%f copy ./rc\%f $(OBJS)/rc + +$(OBJS)\xrcdemo.exe: $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj $(OBJS)\xrcdemo_xrcdemo.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj,$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\xrcdemo_xrcdemo.res +| diff --git a/contrib/samples/xrc/makefile.gcc b/contrib/samples/xrc/makefile.gcc new file mode 100644 index 0000000000..322d630f09 --- /dev/null +++ b/contrib/samples/xrc/makefile.gcc @@ -0,0 +1,125 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS) + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p_1 = --define __WXDEBUG__ +endif +ifeq ($(SHARED),1) +__DLLFLAG_p = -DWXUSINGDLL +endif +ifeq ($(SHARED),1) +__DLLFLAG_p_1 = --define WXUSINGDLL +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_HTML_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\xrcdemo.exe data + +$(OBJS)\xrcdemo_custclas.o: .\custclas.cpp + $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $< + +$(OBJS)\xrcdemo_derivdlg.o: .\derivdlg.cpp + $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $< + +$(OBJS)\xrcdemo_myframe.o: .\myframe.cpp + $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $< + +$(OBJS)\xrcdemo_xrcdemo.o: .\xrcdemo.cpp + $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $< + +$(OBJS)\xrcdemo_xrcdemo_rc.o: .\xrcdemo.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir ./../../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib --include-dir ./../../../src/regex --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../include + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe + +data: + if not exist $(OBJS)/rc mkdir $(OBJS)/rc + for %%f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%%f copy ./rc\%%f $(OBJS)/rc + +$(OBJS)\xrcdemo.exe: $(OBJS)\xrcdemo_xrcdemo.o $(OBJS)\xrcdemo_myframe.o $(OBJS)\xrcdemo_derivdlg.o $(OBJS)\xrcdemo_custclas.o $(OBJS)\xrcdemo_xrcdemo_rc.o + $(CXX) -o $@ $(OBJS)\xrcdemo_xrcdemo.o $(OBJS)\xrcdemo_myframe.o $(OBJS)\xrcdemo_derivdlg.o $(OBJS)\xrcdemo_custclas.o $(OBJS)\xrcdemo_xrcdemo_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + +.PHONY: all clean diff --git a/contrib/samples/xrc/makefile.vc b/contrib/samples/xrc/makefile.vc index 42fea985a3..69bd7e91ce 100644 --- a/contrib/samples/xrc/makefile.vc +++ b/contrib/samples/xrc/makefile.vc @@ -1,16 +1,141 @@ -# File: makefile.vc For stectrl -# Author: Robin Dunn -# Created: 1-Feb-2000 -# Updated: +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= -WXDIR = $(WXWIN) -PROGRAM = xrcdemo +!include <../../../build/config.vc> -OBJECTS = $(PROGRAM).obj myframe.obj derivdlg.obj custclas.obj +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- -EXTRALIBS = $(WXDIR)\lib\wxxrc$(LIBEXT).lib -EXTRAINC = -I$(WXDIR)\contrib\include +### Variables: ### -!include $(WXDIR)\src\makeprog.vc +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +XRCDEMO_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\xrcdemo.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I. $(__DLLFLAG_p) /I.\..\..\include $(CXXFLAGS) +### Conditionally set variables: ### +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = /d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\xrcdemo.exe data + +$(OBJS)\xrcdemo_custclas.obj: .\custclas.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) $** + +$(OBJS)\xrcdemo_derivdlg.obj: .\derivdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) $** + +$(OBJS)\xrcdemo_myframe.obj: .\myframe.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) $** + +$(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) $** + +$(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\..\include /i.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\..\src\tiff /i.\..\..\..\src\jpeg /i.\..\..\..\src\png /i.\..\..\..\src\zlib /i.\..\..\..\src\regex /i. $(__DLLFLAG_p_1) /i.\..\..\include $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe + +data: + if not exist $(OBJS)/rc mkdir $(OBJS)/rc + for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%f copy ./rc\%f $(OBJS)/rc + +$(OBJS)\xrcdemo.exe: $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj $(OBJS)\xrcdemo_xrcdemo.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj $(OBJS)\xrcdemo_xrcdemo.res wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib +<< diff --git a/contrib/samples/xrc/makefile.wat b/contrib/samples/xrc/makefile.wat new file mode 100644 index 0000000000..4460c9e42d --- /dev/null +++ b/contrib/samples/xrc/makefile.wat @@ -0,0 +1,164 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=. $(__DLLFLAG_p) -i=.\..\..\include $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\xrcdemo.exe data + +$(OBJS)\xrcdemo_custclas.obj : .AUTODEPEND .\custclas.cpp + $(CXX) -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< + +$(OBJS)\xrcdemo_derivdlg.obj : .AUTODEPEND .\derivdlg.cpp + $(CXX) -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< + +$(OBJS)\xrcdemo_myframe.obj : .AUTODEPEND .\myframe.cpp + $(CXX) -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< + +$(OBJS)\xrcdemo_xrcdemo.obj : .AUTODEPEND .\xrcdemo.cpp + $(CXX) -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< + +$(OBJS)\xrcdemo_xrcdemo.res : .AUTODEPEND .\xrcdemo.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=. $(__DLLFLAG_p) -i=.\..\..\include $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe + +data : + if not exist $(OBJS)/rc mkdir $(OBJS)/rc + for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%f copy ./rc\%f $(OBJS)/rc + +$(OBJS)\xrcdemo.exe : $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj $(OBJS)\xrcdemo_xrcdemo.res + @%create $(OBJS)\xrcdemo.lbc + @%append $(OBJS)\xrcdemo.lbc option quiet + @%append $(OBJS)\xrcdemo.lbc name $^@ + @%append $(OBJS)\xrcdemo.lbc option incremental + @%append $(OBJS)\xrcdemo.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj) do @%append $(OBJS)\xrcdemo.lbc file %i + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\xrcdemo.lbc diff --git a/contrib/src/animate/Makefile.in b/contrib/src/animate/Makefile.in index 029804e7a2..a8126588b3 100644 --- a/contrib/src/animate/Makefile.in +++ b/contrib/src/animate/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -17,6 +17,7 @@ CXXFLAGS = @CXXFLAGS@ DLLPREFIX = @DLLPREFIX@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_DIR = @INSTALL_DIR@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -40,8 +41,14 @@ top_srcdir = @top_srcdir@ ### Variables: ### -ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include -DWXMAKINGDLL_ANIMATE $(CXXFLAGS) $(PIC_FLAG) -ANIMATELIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include $(CXXFLAGS) +ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include \ + -DWXUSINGDLL -DWXMAKINGDLL_ANIMATE $(CXXFLAGS) $(PIC_FLAG) +ANIMATELIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -68,36 +75,73 @@ ANIMATELIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_SHARED_1@__animatedll___depname = $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) -@COND_PLATFORM_WIN32_1@__animatedll___importlib = -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(DLLIMPEXT) -@COND_PLATFORM_WIN32_1@__animatedll___importlib = -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(DLLIMPEXT) -@COND_PLATFORM_MACOSX_1@__animatedll___macinstnamecmd = -install_name $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) -@COND_PLATFORM_MACOSX_1@__animatedll___macver = -compatibility_version 2.5 -current_version 2.5.0 -@COND_USE_SOSYMLINKS_1@__animatedll___so_symlinks_cmd = rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(DLLIMPEXT) -@COND_USE_SOSYMLINKS_1@__animatedll___so_symlinks_inst_cmd = rm -f libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(DLLIMPEXT) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(DLLIMPEXT) -@COND_USE_SOVERLINUX_1@__animatedll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) -@COND_USE_SOVERSOLARIS_1@__animatedll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__animatedll___targetsuf2 = .$(SO_SUFFIX).0 -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__animatedll___targetsuf2 = .0.$(SO_SUFFIX) +@COND_SHARED_1@__animatedll___depname = \ +@COND_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) +@COND_PLATFORM_WIN32_1@__animatedll___importlib = \ +@COND_PLATFORM_WIN32_1@ -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__animatedll___importlib = \ +@COND_PLATFORM_WIN32_1@ -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_MACOSX_1@__animatedll___macinstnamecmd \ +@COND_PLATFORM_MACOSX_1@ = -install_name \ +@COND_PLATFORM_MACOSX_1@ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__animatedll___macver = \ +@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.5 -current_version 2.5.0 +@COND_USE_SOSYMLINKS_1@__animatedll___so_symlinks_cmd \ +@COND_USE_SOSYMLINKS_1@ = rm -f \ +@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ +@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) \ +@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) \ +@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__animatedll___so_symlinks_inst_cmd \ +@COND_USE_SOSYMLINKS_1@ = rm -f \ +@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) \ +@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOVERLINUX_1@__animatedll___soname_flags = \ +@COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) +@COND_USE_SOVERSOLARIS_1@__animatedll___soname_flags \ +@COND_USE_SOVERSOLARIS_1@ = \ +@COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__animatedll___targetsuf2 \ +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__animatedll___targetsuf2 \ +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__animatedll___targetsuf2 = .$(SO_SUFFIX) -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__animatedll___targetsuf3 = .$(SO_SUFFIX).0.0.0 -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__animatedll___targetsuf3 = .0.0.0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__animatedll___targetsuf3 \ +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__animatedll___targetsuf3 \ +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__animatedll___targetsuf3 = .$(SO_SUFFIX) -@COND_SHARED_0@__animatelib___depname = $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5.a +@COND_SHARED_0@__animatelib___depname = \ +@COND_SHARED_0@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).a @COND_SHARED_1@__install_animatedll___depname = install_animatedll @COND_SHARED_0@__install_animatelib___depname = install_animatelib @@ -112,7 +156,7 @@ all: $(__animatedll___depname) $(__animatelib___depname) animatedll_animate.o: $(srcdir)/animate.cpp $(CXXC) -c -o $@ $(ANIMATEDLL_CXXFLAGS) $< -@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5.a: animatelib_animate.o +@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).a: animatelib_animate.o @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ animatelib_animate.o @COND_SHARED_0@ $(RANLIB) $@ @@ -124,9 +168,9 @@ clean: rm -rf ./.deps rm -f -f ./*.o rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(DLLIMPEXT) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5.a + rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf2) + rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).a distclean: clean rm -f configure config.cache config.log config.status @@ -146,13 +190,13 @@ install-strip: install @COND_SHARED_1@install_animatedll: @COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(DLLIMPEXT) $(libdir) +@COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) @COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__animatedll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_animatelib: @COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5.a $(libdir) +@COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).a $(libdir) uninstall: diff --git a/contrib/src/fl/Makefile.in b/contrib/src/fl/Makefile.in index 83fced82ca..638456cbd9 100644 --- a/contrib/src/fl/Makefile.in +++ b/contrib/src/fl/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -17,6 +17,7 @@ CXXFLAGS = @CXXFLAGS@ DLLPREFIX = @DLLPREFIX@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_DIR = @INSTALL_DIR@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -40,8 +41,14 @@ top_srcdir = @top_srcdir@ ### Variables: ### -FLDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_FL $(CXXFLAGS) $(PIC_FLAG) -FLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include $(CXXFLAGS) +FLDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include \ + -DWXUSINGDLL -DWXMAKINGDLL_FL $(CXXFLAGS) $(PIC_FLAG) +FLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -68,36 +75,72 @@ FLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_SHARED_1@__fldll___depname = $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) -@COND_PLATFORM_WIN32_1@__fldll___importlib = -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(DLLIMPEXT) -@COND_PLATFORM_WIN32_1@__fldll___importlib = -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(DLLIMPEXT) -@COND_PLATFORM_MACOSX_1@__fldll___macinstnamecmd = -install_name $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) -@COND_PLATFORM_MACOSX_1@__fldll___macver = -compatibility_version 2.5 -current_version 2.5.0 -@COND_USE_SOSYMLINKS_1@__fldll___so_symlinks_cmd = rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(DLLIMPEXT) -@COND_USE_SOSYMLINKS_1@__fldll___so_symlinks_inst_cmd = rm -f libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(DLLIMPEXT) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(DLLIMPEXT) -@COND_USE_SOVERLINUX_1@__fldll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) -@COND_USE_SOVERSOLARIS_1@__fldll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__fldll___targetsuf2 = .$(SO_SUFFIX).0 -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__fldll___targetsuf2 = .0.$(SO_SUFFIX) +@COND_SHARED_1@__fldll___depname = \ +@COND_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) +@COND_PLATFORM_WIN32_1@__fldll___importlib = \ +@COND_PLATFORM_WIN32_1@ -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__fldll___importlib = \ +@COND_PLATFORM_WIN32_1@ -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_MACOSX_1@__fldll___macinstnamecmd = \ +@COND_PLATFORM_MACOSX_1@ -install_name \ +@COND_PLATFORM_MACOSX_1@ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__fldll___macver = \ +@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.5 -current_version 2.5.0 +@COND_USE_SOSYMLINKS_1@__fldll___so_symlinks_cmd = rm \ +@COND_USE_SOSYMLINKS_1@ -f \ +@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ +@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) \ +@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) \ +@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__fldll___so_symlinks_inst_cmd \ +@COND_USE_SOSYMLINKS_1@ = rm -f \ +@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) \ +@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOVERLINUX_1@__fldll___soname_flags = \ +@COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) +@COND_USE_SOVERSOLARIS_1@__fldll___soname_flags = \ +@COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__fldll___targetsuf2 \ +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__fldll___targetsuf2 \ +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__fldll___targetsuf2 = .$(SO_SUFFIX) -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__fldll___targetsuf3 = .$(SO_SUFFIX).0.0.0 -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__fldll___targetsuf3 = .0.0.0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__fldll___targetsuf3 \ +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__fldll___targetsuf3 \ +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__fldll___targetsuf3 = .$(SO_SUFFIX) -@COND_SHARED_0@__fllib___depname = $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5.a +@COND_SHARED_0@__fllib___depname = \ +@COND_SHARED_0@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).a @COND_SHARED_1@__install_fldll___depname = install_fldll @COND_SHARED_0@__install_fllib___depname = install_fllib @@ -109,9 +152,9 @@ clean: rm -rf ./.deps rm -f -f ./*.o rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(DLLIMPEXT) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5.a + rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) + rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).a distclean: clean rm -f configure config.cache config.log config.status @@ -172,7 +215,7 @@ fldll_toolwnd.o: $(srcdir)/toolwnd.cpp fldll_updatesmgr.o: $(srcdir)/updatesmgr.cpp $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< -@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5.a: fllib_antiflickpl.o fllib_bardragpl.o fllib_barhintspl.o fllib_cbcustom.o fllib_controlbar.o fllib_dyntbar.o fllib_dyntbarhnd.o fllib_frmview.o fllib_garbagec.o fllib_gcupdatesmgr.o fllib_hintanimpl.o fllib_newbmpbtn.o fllib_panedrawpl.o fllib_rowdragpl.o fllib_rowlayoutpl.o fllib_toolwnd.o fllib_updatesmgr.o +@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).a: fllib_antiflickpl.o fllib_bardragpl.o fllib_barhintspl.o fllib_cbcustom.o fllib_controlbar.o fllib_dyntbar.o fllib_dyntbarhnd.o fllib_frmview.o fllib_garbagec.o fllib_gcupdatesmgr.o fllib_hintanimpl.o fllib_newbmpbtn.o fllib_panedrawpl.o fllib_rowdragpl.o fllib_rowlayoutpl.o fllib_toolwnd.o fllib_updatesmgr.o @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ fllib_antiflickpl.o fllib_bardragpl.o fllib_barhintspl.o fllib_cbcustom.o fllib_controlbar.o fllib_dyntbar.o fllib_dyntbarhnd.o fllib_frmview.o fllib_garbagec.o fllib_gcupdatesmgr.o fllib_hintanimpl.o fllib_newbmpbtn.o fllib_panedrawpl.o fllib_rowdragpl.o fllib_rowlayoutpl.o fllib_toolwnd.o fllib_updatesmgr.o @COND_SHARED_0@ $(RANLIB) $@ @@ -242,13 +285,13 @@ install-strip: install @COND_SHARED_1@install_fldll: @COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(DLLIMPEXT) $(libdir) +@COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) @COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__fldll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_fllib: @COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5.a $(libdir) +@COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).a $(libdir) uninstall: diff --git a/contrib/src/gizmos/Makefile.in b/contrib/src/gizmos/Makefile.in index 6936572929..fc628a59b1 100644 --- a/contrib/src/gizmos/Makefile.in +++ b/contrib/src/gizmos/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -17,6 +17,7 @@ CXXFLAGS = @CXXFLAGS@ DLLPREFIX = @DLLPREFIX@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_DIR = @INSTALL_DIR@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -40,8 +41,14 @@ top_srcdir = @top_srcdir@ ### Variables: ### -GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include $(CXXFLAGS) -GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) +GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include \ + -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS $(CXXFLAGS) $(PIC_FLAG) +GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -53,6 +60,7 @@ GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$ @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR) @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = +@COND_TOOLKIT_MAC@WXBASEPORT = _carbon @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc @COND_BUILD_DEBUG@WXDEBUGFLAG = d @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) @@ -67,35 +75,73 @@ GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$ @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_SHARED_1@__gizmosdll___depname = $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) -@COND_PLATFORM_WIN32_1@__gizmosdll___importlib = -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) -@COND_PLATFORM_WIN32_1@__gizmosdll___importlib = -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) -@COND_PLATFORM_MACOSX_1@__gizmosdll___macinstnamecmd = -install_name $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) -@COND_PLATFORM_MACOSX_1@__gizmosdll___macver = -compatibility_version 2.5 -current_version 2.5.0 -@COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_cmd = rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) -@COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_inst_cmd = rm -f libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) -@COND_USE_SOVERLINUX_1@__gizmosdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) -@COND_USE_SOVERSOLARIS_1@__gizmosdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__gizmosdll___targetsuf2 = .$(SO_SUFFIX).0 -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmosdll___targetsuf2 = .0.$(SO_SUFFIX) +@COND_SHARED_1@__gizmosdll___depname = \ +@COND_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) +@COND_PLATFORM_WIN32_1@__gizmosdll___importlib = \ +@COND_PLATFORM_WIN32_1@ -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__gizmosdll___importlib = \ +@COND_PLATFORM_WIN32_1@ -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_MACOSX_1@__gizmosdll___macinstnamecmd \ +@COND_PLATFORM_MACOSX_1@ = -install_name \ +@COND_PLATFORM_MACOSX_1@ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__gizmosdll___macver = \ +@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.5 -current_version 2.5.0 +@COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_cmd \ +@COND_USE_SOSYMLINKS_1@ = rm -f \ +@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ +@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) \ +@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) \ +@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_inst_cmd \ +@COND_USE_SOSYMLINKS_1@ = rm -f \ +@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) \ +@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOVERLINUX_1@__gizmosdll___soname_flags = \ +@COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) +@COND_USE_SOVERSOLARIS_1@__gizmosdll___soname_flags \ +@COND_USE_SOVERSOLARIS_1@ = \ +@COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__gizmosdll___targetsuf2 \ +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmosdll___targetsuf2 \ +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__gizmosdll___targetsuf2 = .$(SO_SUFFIX) -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__gizmosdll___targetsuf3 = .$(SO_SUFFIX).0.0.0 -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmosdll___targetsuf3 = .0.0.0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__gizmosdll___targetsuf3 \ +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmosdll___targetsuf3 \ +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__gizmosdll___targetsuf3 = .$(SO_SUFFIX) -@COND_SHARED_0@__gizmoslib___depname = $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5.a +@COND_SHARED_0@__gizmoslib___depname = \ +@COND_SHARED_0@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a @COND_SHARED_1@__install_gizmosdll___depname = install_gizmosdll @COND_SHARED_0@__install_gizmoslib___depname = install_gizmoslib @@ -107,16 +153,16 @@ clean: rm -rf ./.deps rm -f -f ./*.o rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5.a + rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) + rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh @COND_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3): gizmosdll_dynamicsash.o gizmosdll_editlbox.o gizmosdll_ledctrl.o gizmosdll_multicell.o gizmosdll_splittree.o gizmosdll_statpict.o -@COND_SHARED_1@ $(SHARED_LD_CXX) $@ gizmosdll_dynamicsash.o gizmosdll_editlbox.o gizmosdll_ledctrl.o gizmosdll_multicell.o gizmosdll_splittree.o gizmosdll_statpict.o $(LDFLAGS) $(__gizmosdll___importlib) -L$(top_builddir)lib $(__gizmosdll___macinstnamecmd) $(__gizmosdll___importlib) $(__gizmosdll___soname_flags) $(__gizmosdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ gizmosdll_dynamicsash.o gizmosdll_editlbox.o gizmosdll_ledctrl.o gizmosdll_multicell.o gizmosdll_splittree.o gizmosdll_statpict.o $(LDFLAGS) $(__gizmosdll___importlib) -L$(top_builddir)lib $(__gizmosdll___macinstnamecmd) $(__gizmosdll___importlib) $(__gizmosdll___soname_flags) $(__gizmosdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_BASE_p) $(__WXLIB_CORE_p) @COND_SHARED_1@ $(__gizmosdll___so_symlinks_cmd) gizmosdll_dynamicsash.o: $(srcdir)/dynamicsash.cpp @@ -137,7 +183,7 @@ gizmosdll_splittree.o: $(srcdir)/splittree.cpp gizmosdll_statpict.o: $(srcdir)/statpict.cpp $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< -@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5.a: gizmoslib_dynamicsash.o gizmoslib_editlbox.o gizmoslib_ledctrl.o gizmoslib_multicell.o gizmoslib_splittree.o gizmoslib_statpict.o +@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a: gizmoslib_dynamicsash.o gizmoslib_editlbox.o gizmoslib_ledctrl.o gizmoslib_multicell.o gizmoslib_splittree.o gizmoslib_statpict.o @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ gizmoslib_dynamicsash.o gizmoslib_editlbox.o gizmoslib_ledctrl.o gizmoslib_multicell.o gizmoslib_splittree.o gizmoslib_statpict.o @COND_SHARED_0@ $(RANLIB) $@ @@ -174,13 +220,13 @@ install-strip: install @COND_SHARED_1@install_gizmosdll: @COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) $(libdir) +@COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) @COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__gizmosdll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_gizmoslib: @COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5.a $(libdir) +@COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a $(libdir) uninstall: diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in index 0ef48515c6..4e1be1fa91 100644 --- a/contrib/src/ogl/Makefile.in +++ b/contrib/src/ogl/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/contrib/src/stc/Makefile.in b/contrib/src/stc/Makefile.in index ff006759dc..83b6453227 100644 --- a/contrib/src/stc/Makefile.in +++ b/contrib/src/stc/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/contrib/src/xrc/Makefile.in b/contrib/src/xrc/Makefile.in index d69453304a..650d9e2c53 100644 --- a/contrib/src/xrc/Makefile.in +++ b/contrib/src/xrc/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -19,6 +19,7 @@ CXXFLAGS = @CXXFLAGS@ DLLPREFIX = @DLLPREFIX@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_DIR = @INSTALL_DIR@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -42,10 +43,24 @@ top_srcdir = @top_srcdir@ ### Variables: ### -XRCDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_XRC -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) -XRCDLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_XRC -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) $(PIC_FLAG) -XRCLIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) -XRCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) +XRCDLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include \ + -DWXUSINGDLL -DWXMAKINGDLL_XRC -I$(srcdir)/expat/xmlparse \ + -I$(srcdir)/expat/xmltok $(CFLAGS) $(PIC_FLAG) +XRCDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include \ + -DWXUSINGDLL -DWXMAKINGDLL_XRC -I$(srcdir)/expat/xmlparse \ + -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) +XRCLIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include \ + -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) +XRCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include \ + -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) ### Conditionally set variables: ### @@ -74,39 +89,76 @@ XRCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(to @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_0@__WXLIB_HTML_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_HTML_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_SHARED_1@__install_xrcdll___depname = install_xrcdll @COND_SHARED_0@__install_xrclib___depname = install_xrclib -@COND_SHARED_1@__xrcdll___depname = $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) -@COND_PLATFORM_WIN32_1@__xrcdll___importlib = -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) -@COND_PLATFORM_WIN32_1@__xrcdll___importlib = -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) -@COND_PLATFORM_MACOSX_1@__xrcdll___macinstnamecmd = -install_name $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) -@COND_PLATFORM_MACOSX_1@__xrcdll___macver = -compatibility_version 2.5 -current_version 2.5.0 -@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_cmd = rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) -@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd = rm -f libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) -@COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) -@COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__xrcdll___targetsuf2 = .$(SO_SUFFIX).0 -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf2 = .0.$(SO_SUFFIX) +@COND_SHARED_1@__xrcdll___depname = \ +@COND_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) +@COND_PLATFORM_WIN32_1@__xrcdll___importlib = \ +@COND_PLATFORM_WIN32_1@ -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__xrcdll___importlib = \ +@COND_PLATFORM_WIN32_1@ -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_MACOSX_1@__xrcdll___macinstnamecmd = \ +@COND_PLATFORM_MACOSX_1@ -install_name \ +@COND_PLATFORM_MACOSX_1@ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__xrcdll___macver = \ +@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.5 -current_version 2.5.0 +@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_cmd = \ +@COND_USE_SOSYMLINKS_1@ rm -f \ +@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ +@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \ +@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \ +@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd \ +@COND_USE_SOSYMLINKS_1@ = rm -f \ +@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \ +@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = \ +@COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) +@COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = \ +@COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__xrcdll___targetsuf2 \ +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf2 \ +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__xrcdll___targetsuf2 = .$(SO_SUFFIX) -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__xrcdll___targetsuf3 = .$(SO_SUFFIX).0.0.0 -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf3 = .0.0.0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__xrcdll___targetsuf3 \ +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf3 \ +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__xrcdll___targetsuf3 = .$(SO_SUFFIX) -@COND_SHARED_0@__xrclib___depname = $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a +@COND_SHARED_0@__xrclib___depname = \ +@COND_SHARED_0@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a ### Targets: ### @@ -116,9 +168,9 @@ clean: rm -rf ./.deps rm -f -f ./*.o rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a + rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) + rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a distclean: clean rm -f configure config.cache config.log config.status @@ -138,13 +190,13 @@ install-strip: install @COND_SHARED_1@install_xrcdll: @COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(libdir) +@COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) @COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__xrcdll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_xrclib: @COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a $(libdir) +@COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a $(libdir) uninstall: @@ -275,7 +327,7 @@ xrcdll_xmlrsall.o: $(srcdir)/xmlrsall.cpp xrcdll_xmltok.o: $(srcdir)/expat/xmltok/xmltok.c $(CCC) -c -o $@ $(XRCDLL_CFLAGS) $< -@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a: xrclib_xmlparse.o xrclib_xmltok.o xrclib_xmlrole.o xrclib_xml.o xrclib_xmlres.o xrclib_xh_bmp.o xrclib_xh_bmpbt.o xrclib_xh_bttn.o xrclib_xh_cald.o xrclib_xh_chckb.o xrclib_xh_chckl.o xrclib_xh_choic.o xrclib_xh_combo.o xrclib_xh_dlg.o xrclib_xh_frame.o xrclib_xh_gauge.o xrclib_xh_gdctl.o xrclib_xh_html.o xrclib_xh_listb.o xrclib_xh_listc.o xrclib_xh_menu.o xrclib_xh_notbk.o xrclib_xh_panel.o xrclib_xh_radbt.o xrclib_xh_radbx.o xrclib_xh_scrol.o xrclib_xh_scwin.o xrclib_xh_sizer.o xrclib_xh_slidr.o xrclib_xh_spin.o xrclib_xh_split.o xrclib_xh_stbmp.o xrclib_xh_stbox.o xrclib_xh_stlin.o xrclib_xh_sttxt.o xrclib_xh_text.o xrclib_xh_toolb.o xrclib_xh_tree.o xrclib_xh_unkwn.o xrclib_xh_wizrd.o xrclib_xmlrsall.o +@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a: xrclib_xmlparse.o xrclib_xmltok.o xrclib_xmlrole.o xrclib_xml.o xrclib_xmlres.o xrclib_xh_bmp.o xrclib_xh_bmpbt.o xrclib_xh_bttn.o xrclib_xh_cald.o xrclib_xh_chckb.o xrclib_xh_chckl.o xrclib_xh_choic.o xrclib_xh_combo.o xrclib_xh_dlg.o xrclib_xh_frame.o xrclib_xh_gauge.o xrclib_xh_gdctl.o xrclib_xh_html.o xrclib_xh_listb.o xrclib_xh_listc.o xrclib_xh_menu.o xrclib_xh_notbk.o xrclib_xh_panel.o xrclib_xh_radbt.o xrclib_xh_radbx.o xrclib_xh_scrol.o xrclib_xh_scwin.o xrclib_xh_sizer.o xrclib_xh_slidr.o xrclib_xh_spin.o xrclib_xh_split.o xrclib_xh_stbmp.o xrclib_xh_stbox.o xrclib_xh_stlin.o xrclib_xh_sttxt.o xrclib_xh_text.o xrclib_xh_toolb.o xrclib_xh_tree.o xrclib_xh_unkwn.o xrclib_xh_wizrd.o xrclib_xmlrsall.o @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ xrclib_xmlparse.o xrclib_xmltok.o xrclib_xmlrole.o xrclib_xml.o xrclib_xmlres.o xrclib_xh_bmp.o xrclib_xh_bmpbt.o xrclib_xh_bttn.o xrclib_xh_cald.o xrclib_xh_chckb.o xrclib_xh_chckl.o xrclib_xh_choic.o xrclib_xh_combo.o xrclib_xh_dlg.o xrclib_xh_frame.o xrclib_xh_gauge.o xrclib_xh_gdctl.o xrclib_xh_html.o xrclib_xh_listb.o xrclib_xh_listc.o xrclib_xh_menu.o xrclib_xh_notbk.o xrclib_xh_panel.o xrclib_xh_radbt.o xrclib_xh_radbx.o xrclib_xh_scrol.o xrclib_xh_scwin.o xrclib_xh_sizer.o xrclib_xh_slidr.o xrclib_xh_spin.o xrclib_xh_split.o xrclib_xh_stbmp.o xrclib_xh_stbox.o xrclib_xh_stlin.o xrclib_xh_sttxt.o xrclib_xh_text.o xrclib_xh_toolb.o xrclib_xh_tree.o xrclib_xh_unkwn.o xrclib_xh_wizrd.o xrclib_xmlrsall.o @COND_SHARED_0@ $(RANLIB) $@ diff --git a/samples/Makefile.in b/samples/Makefile.in index 841f526548..76d98b3a05 100644 --- a/samples/Makefile.in +++ b/samples/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in index fbe8549b29..9ecfb162ec 100644 --- a/samples/access/Makefile.in +++ b/samples/access/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -ACCESSTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +ACCESSTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ ACCESSTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o accesstest$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o accesstest$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__accesstest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__accesstest___mac_setfilecmd = $(SETFILE) -a C accesstest$(EXEEXT) +@COND_PLATFORM_MAC_1@__accesstest___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C accesstest$(EXEEXT) @COND_PLATFORM_WIN32_1@__accesstest___win32rc = accesstest_accesstest_rc.o ### Targets: ### @@ -85,7 +112,7 @@ ACCESSTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I all: accesstest$(EXEEXT) accesstest$(EXEEXT): accesstest_accesstest.o $(__accesstest___win32rc) - $(CXX) -o $@ accesstest_accesstest.o $(__accesstest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ accesstest_accesstest.o $(__accesstest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__accesstest___mac_rezcmd) $(__accesstest___mac_setfilecmd) diff --git a/samples/access/makefile.bcc b/samples/access/makefile.bcc new file mode 100644 index 0000000000..9c98195b01 --- /dev/null +++ b/samples/access/makefile.bcc @@ -0,0 +1,135 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +ACCESSTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\accesstest.exe + +$(OBJS)\accesstest_accesstest.obj: .\accesstest.cpp + $(CXX) -q -c -P -o$@ $(ACCESSTEST_CXXFLAGS) $** + +$(OBJS)\accesstest_accesstest.res: .\accesstest.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +$(OBJS)\accesstest.exe: $(OBJS)\accesstest_accesstest.obj $(OBJS)\accesstest_accesstest.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\accesstest_accesstest.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\accesstest_accesstest.res +| + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe diff --git a/samples/access/makefile.gcc b/samples/access/makefile.gcc index c90d0a28e8..e9428f66c7 100644 --- a/samples/access/makefile.gcc +++ b/samples/access/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +ACCESSTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -ACCESSTEST_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -120,14 +100,10 @@ $(OBJS)\accesstest_accesstest_rc.o: .\accesstest.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir ./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib --include-dir ./../../src/regex --include-dir . $(__DLLFLAG_p_1) $(OBJS)\accesstest.exe: $(OBJS)\accesstest_accesstest.o $(OBJS)\accesstest_accesstest_rc.o - $(CXX) -o $@ $(OBJS)\accesstest_accesstest.o $(OBJS)\accesstest_accesstest_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(OBJS)\accesstest_accesstest.o $(OBJS)\accesstest_accesstest_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe -install: all - -uninstall: - -.PHONY: all +.PHONY: all clean diff --git a/samples/access/makefile.vc b/samples/access/makefile.vc index 036dd5f562..a858f24c13 100644 --- a/samples/access/makefile.vc +++ b/samples/access/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +ACCESSTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\accesstest.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -ACCESSTEST_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\accesstest_accesstest.obj: .\accesstest.cpp $(CXX) /c /nologo /TP /Fo$@ $(ACCESSTEST_CXXFLAGS) $** $(OBJS)\accesstest_accesstest.res: .\accesstest.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** $(OBJS)\accesstest.exe: $(OBJS)\accesstest_accesstest.obj $(OBJS)\accesstest_accesstest.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\accesstest_accesstest.obj $(OBJS)\accesstest_accesstest.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\accesstest_accesstest.obj $(OBJS)\accesstest_accesstest.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe - -install: all - -uninstall: diff --git a/samples/access/makefile.wat b/samples/access/makefile.wat index c1bcfb338e..19127d457e 100644 --- a/samples/access/makefile.wat +++ b/samples/access/makefile.wat @@ -1,15 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= -OUTPUTDIR = Watcom\ +!include ../../build/config.wat -PROGRAM = accesstest -OBJECTS = $(OUTPUTDIR)$(PROGRAM).obj +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- -!include $(%WXWIN)\src\makeprog.wat +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +ACCESSTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\accesstest.exe + +$(OBJS)\accesstest_accesstest.obj : .AUTODEPEND .\accesstest.cpp + $(CXX) -zq -fo=$^@ $(ACCESSTEST_CXXFLAGS) $< + +$(OBJS)\accesstest_accesstest.res : .AUTODEPEND .\accesstest.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +$(OBJS)\accesstest.exe : $(OBJS)\accesstest_accesstest.obj $(OBJS)\accesstest_accesstest.res + @%create $(OBJS)\accesstest.lbc + @%append $(OBJS)\accesstest.lbc option quiet + @%append $(OBJS)\accesstest.lbc name $^@ + @%append $(OBJS)\accesstest.lbc option incremental + @%append $(OBJS)\accesstest.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\accesstest_accesstest.obj) do @%append $(OBJS)\accesstest.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\accesstest.lbc + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in index 0f1838fe37..072bd09544 100644 --- a/samples/artprov/Makefile.in +++ b/samples/artprov/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -ARTTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +ARTTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ ARTTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o arttest$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o arttest$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__arttest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__arttest___mac_setfilecmd = $(SETFILE) -a C arttest$(EXEEXT) +@COND_PLATFORM_MAC_1@__arttest___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C arttest$(EXEEXT) @COND_PLATFORM_WIN32_1@__arttest___win32rc = arttest_arttest_rc.o ### Targets: ### @@ -85,7 +112,7 @@ ARTTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t all: arttest$(EXEEXT) arttest$(EXEEXT): arttest_arttest.o arttest_artbrows.o $(__arttest___win32rc) - $(CXX) -o $@ arttest_arttest.o arttest_artbrows.o $(__arttest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ arttest_arttest.o arttest_artbrows.o $(__arttest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__arttest___mac_rezcmd) $(__arttest___mac_setfilecmd) diff --git a/samples/artprov/makefile.bcc b/samples/artprov/makefile.bcc index a7032e8d77..539d890af2 100644 --- a/samples/artprov/makefile.bcc +++ b/samples/artprov/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -ARTTEST_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +ARTTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -146,18 +125,14 @@ $(OBJS)\arttest_arttest.obj: .\arttest.cpp $(CXX) -q -c -P -o$@ $(ARTTEST_CXXFLAGS) $** $(OBJS)\arttest_arttest.res: .\arttest.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** $(OBJS)\arttest.exe: $(OBJS)\arttest_arttest.obj $(OBJS)\arttest_artbrows.obj $(OBJS)\arttest_arttest.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\arttest_arttest.obj $(OBJS)\arttest_artbrows.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\arttest_arttest.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\arttest_arttest.obj $(OBJS)\arttest_artbrows.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\arttest_arttest.res | clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe - -install: all - -uninstall: diff --git a/samples/artprov/makefile.gcc b/samples/artprov/makefile.gcc index b3901102e1..a9ec8c35b8 100644 --- a/samples/artprov/makefile.gcc +++ b/samples/artprov/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +ARTTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -ARTTEST_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,14 +103,10 @@ $(OBJS)\arttest_arttest_rc.o: .\arttest.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir ./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib --include-dir ./../../src/regex --include-dir . $(__DLLFLAG_p_1) $(OBJS)\arttest.exe: $(OBJS)\arttest_arttest.o $(OBJS)\arttest_artbrows.o $(OBJS)\arttest_arttest_rc.o - $(CXX) -o $@ $(OBJS)\arttest_arttest.o $(OBJS)\arttest_artbrows.o $(OBJS)\arttest_arttest_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(OBJS)\arttest_arttest.o $(OBJS)\arttest_artbrows.o $(OBJS)\arttest_arttest_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe -install: all - -uninstall: - -.PHONY: all +.PHONY: all clean diff --git a/samples/artprov/makefile.vc b/samples/artprov/makefile.vc index b457795f4f..77d5ad0ad0 100644 --- a/samples/artprov/makefile.vc +++ b/samples/artprov/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +ARTTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\arttest.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -ARTTEST_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -115,18 +115,14 @@ $(OBJS)\arttest_arttest.obj: .\arttest.cpp $(CXX) /c /nologo /TP /Fo$@ $(ARTTEST_CXXFLAGS) $** $(OBJS)\arttest_arttest.res: .\arttest.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** $(OBJS)\arttest.exe: $(OBJS)\arttest_arttest.obj $(OBJS)\arttest_artbrows.obj $(OBJS)\arttest_arttest.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\arttest_arttest.obj $(OBJS)\arttest_artbrows.obj $(OBJS)\arttest_arttest.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\arttest_arttest.obj $(OBJS)\arttest_artbrows.obj $(OBJS)\arttest_arttest.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe - -install: all - -uninstall: diff --git a/samples/artprov/makefile.wat b/samples/artprov/makefile.wat index bfd496b80b..dae80aa91a 100644 --- a/samples/artprov/makefile.wat +++ b/samples/artprov/makefile.wat @@ -1,12 +1,150 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = arttest -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj $(OUTPUTDIR)\artbrows.obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +ARTTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\arttest.exe + +$(OBJS)\arttest_artbrows.obj : .AUTODEPEND .\artbrows.cpp + $(CXX) -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $< + +$(OBJS)\arttest_arttest.obj : .AUTODEPEND .\arttest.cpp + $(CXX) -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $< + +$(OBJS)\arttest_arttest.res : .AUTODEPEND .\arttest.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +$(OBJS)\arttest.exe : $(OBJS)\arttest_arttest.obj $(OBJS)\arttest_artbrows.obj $(OBJS)\arttest_arttest.res + @%create $(OBJS)\arttest.lbc + @%append $(OBJS)\arttest.lbc option quiet + @%append $(OBJS)\arttest.lbc name $^@ + @%append $(OBJS)\arttest.lbc option incremental + @%append $(OBJS)\arttest.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\arttest_arttest.obj $(OBJS)\arttest_artbrows.obj) do @%append $(OBJS)\arttest.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\arttest.lbc + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in index 8d9f8490f7..95758346ca 100644 --- a/samples/calendar/Makefile.in +++ b/samples/calendar/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CALENDAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +CALENDAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ CALENDAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o calendar$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o calendar$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__calendar___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__calendar___mac_setfilecmd = $(SETFILE) -a C calendar$(EXEEXT) +@COND_PLATFORM_MAC_1@__calendar___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C calendar$(EXEEXT) @COND_PLATFORM_WIN32_1@__calendar___win32rc = calendar_calendar_rc.o ### Targets: ### @@ -85,7 +112,7 @@ CALENDAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( all: calendar$(EXEEXT) calendar$(EXEEXT): calendar_calendar.o $(__calendar___win32rc) - $(CXX) -o $@ calendar_calendar.o $(__calendar___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ calendar_calendar.o $(__calendar___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__calendar___mac_rezcmd) $(__calendar___mac_setfilecmd) diff --git a/samples/calendar/makefile.bcc b/samples/calendar/makefile.bcc index 313e928ef7..24aef16791 100644 --- a/samples/calendar/makefile.bcc +++ b/samples/calendar/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -CALENDAR_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +CALENDAR_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\calendar_calendar.obj: .\calendar.cpp $(CXX) -q -c -P -o$@ $(CALENDAR_CXXFLAGS) $** $(OBJS)\calendar_calendar.res: .\calendar.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** $(OBJS)\calendar.exe: $(OBJS)\calendar_calendar.obj $(OBJS)\calendar_calendar.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\calendar_calendar.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\calendar_calendar.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\calendar_calendar.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\calendar_calendar.res | clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe - -install: all - -uninstall: diff --git a/samples/calendar/makefile.gcc b/samples/calendar/makefile.gcc index 6631c4154a..402c858e53 100644 --- a/samples/calendar/makefile.gcc +++ b/samples/calendar/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### -CALENDAR_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +CALENDAR_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -120,14 +100,10 @@ $(OBJS)\calendar_calendar_rc.o: .\calendar.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir ./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib --include-dir ./../../src/regex --include-dir . $(__DLLFLAG_p_1) $(OBJS)\calendar.exe: $(OBJS)\calendar_calendar.o $(OBJS)\calendar_calendar_rc.o - $(CXX) -o $@ $(OBJS)\calendar_calendar.o $(OBJS)\calendar_calendar_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(OBJS)\calendar_calendar.o $(OBJS)\calendar_calendar_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe -install: all - -uninstall: - -.PHONY: all +.PHONY: all clean diff --git a/samples/calendar/makefile.vc b/samples/calendar/makefile.vc index 816dc444d9..12af3a4135 100644 --- a/samples/calendar/makefile.vc +++ b/samples/calendar/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,7 +12,7 @@ WXUNIV = 0 ### Variables: ### -CALENDAR_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +CALENDAR_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\calendar.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\calendar_calendar.obj: .\calendar.cpp $(CXX) /c /nologo /TP /Fo$@ $(CALENDAR_CXXFLAGS) $** $(OBJS)\calendar_calendar.res: .\calendar.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** $(OBJS)\calendar.exe: $(OBJS)\calendar_calendar.obj $(OBJS)\calendar_calendar.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\calendar_calendar.obj $(OBJS)\calendar_calendar.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\calendar_calendar.obj $(OBJS)\calendar_calendar.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe - -install: all - -uninstall: diff --git a/samples/calendar/makefile.wat b/samples/calendar/makefile.wat index 6ed88aeeeb..8944378bd8 100644 --- a/samples/calendar/makefile.wat +++ b/samples/calendar/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = calendar -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +CALENDAR_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\calendar.exe + +$(OBJS)\calendar_calendar.obj : .AUTODEPEND .\calendar.cpp + $(CXX) -zq -fo=$^@ $(CALENDAR_CXXFLAGS) $< + +$(OBJS)\calendar_calendar.res : .AUTODEPEND .\calendar.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +$(OBJS)\calendar.exe : $(OBJS)\calendar_calendar.obj $(OBJS)\calendar_calendar.res + @%create $(OBJS)\calendar.lbc + @%append $(OBJS)\calendar.lbc option quiet + @%append $(OBJS)\calendar.lbc name $^@ + @%append $(OBJS)\calendar.lbc option incremental + @%append $(OBJS)\calendar.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\calendar_calendar.obj) do @%append $(OBJS)\calendar.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\calendar.lbc + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in index 737be45e00..9257068287 100644 --- a/samples/caret/Makefile.in +++ b/samples/caret/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CARET_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +CARET_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ CARET_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o caret$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o caret$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__caret___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__caret___mac_setfilecmd = $(SETFILE) -a C caret$(EXEEXT) +@COND_PLATFORM_MAC_1@__caret___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C caret$(EXEEXT) @COND_PLATFORM_WIN32_1@__caret___win32rc = caret_caret_rc.o ### Targets: ### @@ -85,7 +112,7 @@ CARET_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top all: caret$(EXEEXT) caret$(EXEEXT): caret_caret.o $(__caret___win32rc) - $(CXX) -o $@ caret_caret.o $(__caret___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ caret_caret.o $(__caret___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__caret___mac_rezcmd) $(__caret___mac_setfilecmd) diff --git a/samples/caret/makefile.bcc b/samples/caret/makefile.bcc index 16d628866d..d93a01d4bf 100644 --- a/samples/caret/makefile.bcc +++ b/samples/caret/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -CARET_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +CARET_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\caret_caret.obj: .\caret.cpp $(CXX) -q -c -P -o$@ $(CARET_CXXFLAGS) $** $(OBJS)\caret_caret.res: .\caret.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** $(OBJS)\caret.exe: $(OBJS)\caret_caret.obj $(OBJS)\caret_caret.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\caret_caret.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\caret_caret.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\caret_caret.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\caret_caret.res | clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe - -install: all - -uninstall: diff --git a/samples/caret/makefile.gcc b/samples/caret/makefile.gcc index 71df91b613..4004055348 100644 --- a/samples/caret/makefile.gcc +++ b/samples/caret/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +CARET_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -CARET_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -120,14 +100,10 @@ $(OBJS)\caret_caret_rc.o: .\caret.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir ./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib --include-dir ./../../src/regex --include-dir . $(__DLLFLAG_p_1) $(OBJS)\caret.exe: $(OBJS)\caret_caret.o $(OBJS)\caret_caret_rc.o - $(CXX) -o $@ $(OBJS)\caret_caret.o $(OBJS)\caret_caret_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(OBJS)\caret_caret.o $(OBJS)\caret_caret_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe -install: all - -uninstall: - -.PHONY: all +.PHONY: all clean diff --git a/samples/caret/makefile.vc b/samples/caret/makefile.vc index 318956f62a..9291821e3b 100644 --- a/samples/caret/makefile.vc +++ b/samples/caret/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +CARET_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\caret.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -CARET_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\caret_caret.obj: .\caret.cpp $(CXX) /c /nologo /TP /Fo$@ $(CARET_CXXFLAGS) $** $(OBJS)\caret_caret.res: .\caret.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** $(OBJS)\caret.exe: $(OBJS)\caret_caret.obj $(OBJS)\caret_caret.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\caret_caret.obj $(OBJS)\caret_caret.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\caret_caret.obj $(OBJS)\caret_caret.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe - -install: all - -uninstall: diff --git a/samples/caret/makefile.wat b/samples/caret/makefile.wat index 29554aeea0..27d56546de 100644 --- a/samples/caret/makefile.wat +++ b/samples/caret/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = caret -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +CARET_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\caret.exe + +$(OBJS)\caret_caret.obj : .AUTODEPEND .\caret.cpp + $(CXX) -zq -fo=$^@ $(CARET_CXXFLAGS) $< + +$(OBJS)\caret_caret.res : .AUTODEPEND .\caret.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +$(OBJS)\caret.exe : $(OBJS)\caret_caret.obj $(OBJS)\caret_caret.res + @%create $(OBJS)\caret.lbc + @%append $(OBJS)\caret.lbc option quiet + @%append $(OBJS)\caret.lbc name $^@ + @%append $(OBJS)\caret.lbc option incremental + @%append $(OBJS)\caret.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\caret_caret.obj) do @%append $(OBJS)\caret.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\caret.lbc + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe diff --git a/samples/checklst/Makefile.in b/samples/checklst/Makefile.in index dfe3895433..7fee71f1b1 100644 --- a/samples/checklst/Makefile.in +++ b/samples/checklst/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CHECKLST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +CHECKLST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ CHECKLST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o checklst$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o checklst$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__checklst___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__checklst___mac_setfilecmd = $(SETFILE) -a C checklst$(EXEEXT) +@COND_PLATFORM_MAC_1@__checklst___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C checklst$(EXEEXT) @COND_PLATFORM_WIN32_1@__checklst___win32rc = checklst_checklst_rc.o ### Targets: ### @@ -85,7 +112,7 @@ CHECKLST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( all: checklst$(EXEEXT) checklst$(EXEEXT): checklst_checklst.o $(__checklst___win32rc) - $(CXX) -o $@ checklst_checklst.o $(__checklst___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ checklst_checklst.o $(__checklst___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__checklst___mac_rezcmd) $(__checklst___mac_setfilecmd) diff --git a/samples/checklst/makefile.bcc b/samples/checklst/makefile.bcc new file mode 100644 index 0000000000..a1853f973c --- /dev/null +++ b/samples/checklst/makefile.bcc @@ -0,0 +1,135 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +CHECKLST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\checklst.exe + +$(OBJS)\checklst_checklst.obj: .\checklst.cpp + $(CXX) -q -c -P -o$@ $(CHECKLST_CXXFLAGS) $** + +$(OBJS)\checklst_checklst.res: .\checklst.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +$(OBJS)\checklst.exe: $(OBJS)\checklst_checklst.obj $(OBJS)\checklst_checklst.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\checklst_checklst.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\checklst_checklst.res +| + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\checklst.exe del $(OBJS)\checklst.exe diff --git a/samples/checklst/makefile.gcc b/samples/checklst/makefile.gcc index 5817dc4bd9..7debefa35c 100644 --- a/samples/checklst/makefile.gcc +++ b/samples/checklst/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +CHECKLST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -CHECKLST_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -120,14 +100,10 @@ $(OBJS)\checklst_checklst_rc.o: .\checklst.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir ./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib --include-dir ./../../src/regex --include-dir . $(__DLLFLAG_p_1) $(OBJS)\checklst.exe: $(OBJS)\checklst_checklst.o $(OBJS)\checklst_checklst_rc.o - $(CXX) -o $@ $(OBJS)\checklst_checklst.o $(OBJS)\checklst_checklst_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(OBJS)\checklst_checklst.o $(OBJS)\checklst_checklst_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\checklst.exe del $(OBJS)\checklst.exe -install: all - -uninstall: - -.PHONY: all +.PHONY: all clean diff --git a/samples/checklst/makefile.vc b/samples/checklst/makefile.vc index 79e4194734..3134b15e49 100644 --- a/samples/checklst/makefile.vc +++ b/samples/checklst/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +CHECKLST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\checklst.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -CHECKLST_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\checklst_checklst.obj: .\checklst.cpp $(CXX) /c /nologo /TP /Fo$@ $(CHECKLST_CXXFLAGS) $** $(OBJS)\checklst_checklst.res: .\checklst.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** $(OBJS)\checklst.exe: $(OBJS)\checklst_checklst.obj $(OBJS)\checklst_checklst.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\checklst_checklst.obj $(OBJS)\checklst_checklst.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\checklst_checklst.obj $(OBJS)\checklst_checklst.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\checklst.exe del $(OBJS)\checklst.exe - -install: all - -uninstall: diff --git a/samples/checklst/makefile.wat b/samples/checklst/makefile.wat index 0b7e01e5f3..d041453fc1 100644 --- a/samples/checklst/makefile.wat +++ b/samples/checklst/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = checklst -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +CHECKLST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\checklst.exe + +$(OBJS)\checklst_checklst.obj : .AUTODEPEND .\checklst.cpp + $(CXX) -zq -fo=$^@ $(CHECKLST_CXXFLAGS) $< + +$(OBJS)\checklst_checklst.res : .AUTODEPEND .\checklst.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +$(OBJS)\checklst.exe : $(OBJS)\checklst_checklst.obj $(OBJS)\checklst_checklst.res + @%create $(OBJS)\checklst.lbc + @%append $(OBJS)\checklst.lbc option quiet + @%append $(OBJS)\checklst.lbc name $^@ + @%append $(OBJS)\checklst.lbc option incremental + @%append $(OBJS)\checklst.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\checklst_checklst.obj) do @%append $(OBJS)\checklst.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\checklst.lbc library %i + @%append $(OBJS)\checklst.lbc option resource=$(OBJS)\checklst_checklst.res + wlink @$(OBJS)\checklst.lbc + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\checklst.exe del $(OBJS)\checklst.exe diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in index 9474186548..1dbbab01d7 100644 --- a/samples/config/Makefile.in +++ b/samples/config/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CONFTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +CONFTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ CONFTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o conftest$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o conftest$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__conftest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__conftest___mac_setfilecmd = $(SETFILE) -a C conftest$(EXEEXT) +@COND_PLATFORM_MAC_1@__conftest___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C conftest$(EXEEXT) @COND_PLATFORM_WIN32_1@__conftest___win32rc = conftest_conftest_rc.o ### Targets: ### @@ -90,7 +117,7 @@ clean: rm -f conftest$(EXEEXT) conftest$(EXEEXT): conftest_conftest.o $(__conftest___win32rc) - $(CXX) -o $@ conftest_conftest.o $(__conftest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ conftest_conftest.o $(__conftest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__conftest___mac_rezcmd) $(__conftest___mac_setfilecmd) diff --git a/samples/config/makefile.bcc b/samples/config/makefile.bcc index 602420db18..7c60bcea69 100644 --- a/samples/config/makefile.bcc +++ b/samples/config/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -CONFTEST_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +CONFTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,7 +122,7 @@ $(OBJS)\conftest_conftest.obj: .\conftest.cpp $(CXX) -q -c -P -o$@ $(CONFTEST_CXXFLAGS) $** $(OBJS)\conftest_conftest.res: .\conftest.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -151,10 +130,6 @@ clean: -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe $(OBJS)\conftest.exe: $(OBJS)\conftest_conftest.obj $(OBJS)\conftest_conftest.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\conftest_conftest.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\conftest_conftest.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\conftest_conftest.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\conftest_conftest.res | - -install: all - -uninstall: diff --git a/samples/config/makefile.gcc b/samples/config/makefile.gcc index 69ddf7545d..f1b5efe20f 100644 --- a/samples/config/makefile.gcc +++ b/samples/config/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### -CONFTEST_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +CONFTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -124,10 +104,6 @@ clean: -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe $(OBJS)\conftest.exe: $(OBJS)\conftest_conftest.o $(OBJS)\conftest_conftest_rc.o - $(CXX) -o $@ $(OBJS)\conftest_conftest.o $(OBJS)\conftest_conftest_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -install: all - -uninstall: + $(CXX) -o $@ $(OBJS)\conftest_conftest.o $(OBJS)\conftest_conftest_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/config/makefile.vc b/samples/config/makefile.vc index df95ac4b4f..7d2d35926d 100644 --- a/samples/config/makefile.vc +++ b/samples/config/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,7 +12,7 @@ WXUNIV = 0 ### Variables: ### -CONFTEST_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +CONFTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\conftest.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,7 +112,7 @@ $(OBJS)\conftest_conftest.obj: .\conftest.cpp $(CXX) /c /nologo /TP /Fo$@ $(CONFTEST_CXXFLAGS) $** $(OBJS)\conftest_conftest.res: .\conftest.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -120,10 +120,6 @@ clean: -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe $(OBJS)\conftest.exe: $(OBJS)\conftest_conftest.obj $(OBJS)\conftest_conftest.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\conftest_conftest.obj $(OBJS)\conftest_conftest.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\conftest_conftest.obj $(OBJS)\conftest_conftest.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -install: all - -uninstall: diff --git a/samples/config/makefile.wat b/samples/config/makefile.wat index c40ba2d2fc..d3250c2521 100644 --- a/samples/config/makefile.wat +++ b/samples/config/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = conftest -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +CONFTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\conftest.exe + +$(OBJS)\conftest_conftest.obj : .AUTODEPEND .\conftest.cpp + $(CXX) -zq -fo=$^@ $(CONFTEST_CXXFLAGS) $< + +$(OBJS)\conftest_conftest.res : .AUTODEPEND .\conftest.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe + +$(OBJS)\conftest.exe : $(OBJS)\conftest_conftest.obj $(OBJS)\conftest_conftest.res + @%create $(OBJS)\conftest.lbc + @%append $(OBJS)\conftest.lbc option quiet + @%append $(OBJS)\conftest.lbc name $^@ + @%append $(OBJS)\conftest.lbc option incremental + @%append $(OBJS)\conftest.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\conftest_conftest.obj) do @%append $(OBJS)\conftest.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\conftest.lbc diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in index c50764bb34..e6b58b1b88 100644 --- a/samples/console/Makefile.in +++ b/samples/console/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -15,6 +15,7 @@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ @@ -27,7 +28,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CONSOLE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(__MULTILIB_FLAG_p) $(CXXFLAGS) +CONSOLE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(__MULTILIB_FLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -46,17 +50,26 @@ CONSOLE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__MULTILIB_FLAG_p = -DwxUSE_GUI=0 -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_PLATFORM_MAC_1@__console___mac_setfilecmd = $(SETFILE) -t APPL console$(EXEEXT) +@COND_PLATFORM_MAC_1@__console___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL console$(EXEEXT) ### Targets: ### @@ -68,7 +81,7 @@ clean: rm -f console$(EXEEXT) console$(EXEEXT): console_console.o - $(CXX) -o $@ console_console.o $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(__WXLIB_MONO_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) + $(CXX) -o $@ console_console.o $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(__console___mac_setfilecmd) diff --git a/samples/console/makefile.bcc b/samples/console/makefile.bcc index af217aae8a..ca5a55394d 100644 --- a/samples/console/makefile.bcc +++ b/samples/console/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -CONSOLE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(__MULTILIB_FLAG_p) $(CXXFLAGS) +CONSOLE_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(__MULTILIB_FLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -117,6 +70,18 @@ __OPTIMIZEFLAG_2 = -Od !if "$(BUILD)" == "release" __OPTIMIZEFLAG_2 = -O2 !endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -124,7 +89,8 @@ __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -148,14 +114,10 @@ clean: -if exist $(OBJS)\console.exe del $(OBJS)\console.exe $(OBJS)\console.exe: $(OBJS)\console_console.obj - ilink32 -Tpe $(LDFLAGS) $(__DEBUGFLAG) -tWM -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -ap @&&| - c0x32.obj $(OBJS)\console_console.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mti.lib,, + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -ap @&&| + c0x32.obj $(OBJS)\console_console.obj,$@,, $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, | data: if not exist $(OBJS) mkdir $(OBJS) for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -install: all - -uninstall: diff --git a/samples/console/makefile.gcc b/samples/console/makefile.gcc index bacd24a54b..bfeee5f6c6 100644 --- a/samples/console/makefile.gcc +++ b/samples/console/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,8 +12,8 @@ WXUNIV = 0 ### Variables: ### -OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) CONSOLE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(__MULTILIB_FLAG_p) $(CXXFLAGS) +OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -124,14 +89,10 @@ clean: -if exist $(OBJS)\console.exe del $(OBJS)\console.exe $(OBJS)\console.exe: $(OBJS)\console_console.o - $(CXX) -o $@ $(OBJS)\console_console.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(__WXLIB_MONO_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(OBJS)\console_console.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 data: if not exist $(OBJS) mkdir $(OBJS) for %%f in (testdata.fc) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) -install: all - -uninstall: - -.PHONY: all clean install uninstall +.PHONY: all clean diff --git a/samples/console/makefile.vc b/samples/console/makefile.vc index 7d03cdcdbd..0e856221a9 100644 --- a/samples/console/makefile.vc +++ b/samples/console/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +CONSOLE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\console.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(__MULTILIB_FLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -CONSOLE_CXXFLAGS = $(CPPFLAGS) /MD$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\console.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(__MULTILIB_FLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -98,6 +68,12 @@ __OPTIMIZEFLAG_3 = /Od !if "$(BUILD)" == "release" __OPTIMIZEFLAG_3 = /O2 !endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -130,13 +106,9 @@ clean: $(OBJS)\console.exe: $(OBJS)\console_console.obj link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:CONSOLE @<< - $(OBJS)\console_console.obj $(__WXLIB_MONO_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + $(OBJS)\console_console.obj $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << data: if not exist $(OBJS) mkdir $(OBJS) for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -install: all - -uninstall: diff --git a/samples/console/makefile.wat b/samples/console/makefile.wat index 0d704f7e41..2c8b539e7d 100644 --- a/samples/console/makefile.wat +++ b/samples/console/makefile.wat @@ -1,41 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = wpp386 -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include ../../build/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -114,6 +83,13 @@ __OPTIMIZEFLAG_2 = -od !ifeq BUILD release __OPTIMIZEFLAG_2 = -ot -ox !endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif __UNICODE_DEFINE_p = !ifeq UNICODE 1 __UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 @@ -133,8 +109,8 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### +CONSOLE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(__MULTILIB_FLAG_p) $(CXXFLAGS) OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -CONSOLE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm -br -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(__MULTILIB_FLAG_p) $(CXXFLAGS) @@ -163,14 +139,10 @@ $(OBJS)\console.exe : $(OBJS)\console_console.obj @%append $(OBJS)\console.lbc option incremental @%append $(OBJS)\console.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt ref 'main_' @for %i in ( $(OBJS)\console_console.obj) do @%append $(OBJS)\console.lbc file %i - @for %i in ( $(__WXLIB_MONO_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\console.lbc library %i + @for %i in ( $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\console.lbc library %i @%append $(OBJS)\console.lbc wlink @$(OBJS)\console.lbc data : if not exist $(OBJS) mkdir $(OBJS) for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -install : .SYMBOLIC all - -uninstall : .SYMBOLIC diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in index bee2a0709b..1608224e6d 100644 --- a/samples/controls/Makefile.in +++ b/samples/controls/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CONTROLS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +CONTROLS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ CONTROLS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o controls$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o controls$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__controls___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__controls___mac_setfilecmd = $(SETFILE) -a C controls$(EXEEXT) +@COND_PLATFORM_MAC_1@__controls___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C controls$(EXEEXT) @COND_PLATFORM_WIN32_1@__controls___win32rc = controls_controls_rc.o ### Targets: ### @@ -90,7 +117,7 @@ clean: rm -f controls$(EXEEXT) controls$(EXEEXT): controls_controls.o $(__controls___win32rc) - $(CXX) -o $@ controls_controls.o $(__controls___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ controls_controls.o $(__controls___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__controls___mac_rezcmd) $(__controls___mac_setfilecmd) diff --git a/samples/controls/makefile.bcc b/samples/controls/makefile.bcc index d30a4c3c30..67dec3b852 100644 --- a/samples/controls/makefile.bcc +++ b/samples/controls/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -CONTROLS_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +CONTROLS_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,7 +122,7 @@ $(OBJS)\controls_controls.obj: .\controls.cpp $(CXX) -q -c -P -o$@ $(CONTROLS_CXXFLAGS) $** $(OBJS)\controls_controls.res: .\controls.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -151,10 +130,6 @@ clean: -if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe $(OBJS)\controls.exe: $(OBJS)\controls_controls.obj $(OBJS)\controls_controls.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\controls_controls.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\controls_controls.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\controls_controls.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\controls_controls.res | - -install: all - -uninstall: diff --git a/samples/controls/makefile.gcc b/samples/controls/makefile.gcc index 406e523415..84ae82bde0 100644 --- a/samples/controls/makefile.gcc +++ b/samples/controls/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +CONTROLS_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -CONTROLS_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -124,10 +104,6 @@ clean: -if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe $(OBJS)\controls.exe: $(OBJS)\controls_controls.o $(OBJS)\controls_controls_rc.o - $(CXX) -o $@ $(OBJS)\controls_controls.o $(OBJS)\controls_controls_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -install: all - -uninstall: + $(CXX) -o $@ $(OBJS)\controls_controls.o $(OBJS)\controls_controls_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/controls/makefile.vc b/samples/controls/makefile.vc index 27d2dd943d..79c1f9292b 100644 --- a/samples/controls/makefile.vc +++ b/samples/controls/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +CONTROLS_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\controls.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -CONTROLS_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,7 +112,7 @@ $(OBJS)\controls_controls.obj: .\controls.cpp $(CXX) /c /nologo /TP /Fo$@ $(CONTROLS_CXXFLAGS) $** $(OBJS)\controls_controls.res: .\controls.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -120,10 +120,6 @@ clean: -if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe $(OBJS)\controls.exe: $(OBJS)\controls_controls.obj $(OBJS)\controls_controls.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\controls_controls.obj $(OBJS)\controls_controls.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\controls_controls.obj $(OBJS)\controls_controls.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -install: all - -uninstall: diff --git a/samples/controls/makefile.wat b/samples/controls/makefile.wat index 59b1f66026..16835b441f 100644 --- a/samples/controls/makefile.wat +++ b/samples/controls/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = controls -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +CONTROLS_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\controls.exe + +$(OBJS)\controls_controls.obj : .AUTODEPEND .\controls.cpp + $(CXX) -zq -fo=$^@ $(CONTROLS_CXXFLAGS) $< + +$(OBJS)\controls_controls.res : .AUTODEPEND .\controls.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe + +$(OBJS)\controls.exe : $(OBJS)\controls_controls.obj $(OBJS)\controls_controls.res + @%create $(OBJS)\controls.lbc + @%append $(OBJS)\controls.lbc option quiet + @%append $(OBJS)\controls.lbc name $^@ + @%append $(OBJS)\controls.lbc option incremental + @%append $(OBJS)\controls.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\controls_controls.obj) do @%append $(OBJS)\controls.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\controls.lbc diff --git a/samples/db/Makefile.in b/samples/db/Makefile.in index cd9faf06b8..1ac92df9f0 100644 --- a/samples/db/Makefile.in +++ b/samples/db/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -DBTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +DBTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ DBTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(to @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o dbtest$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o dbtest$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__dbtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__dbtest___mac_setfilecmd = $(SETFILE) -a C dbtest$(EXEEXT) +@COND_PLATFORM_MAC_1@__dbtest___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C dbtest$(EXEEXT) @COND_PLATFORM_WIN32_1@__dbtest___win32rc = dbtest_dbtest_rc.o ### Targets: ### @@ -90,7 +117,7 @@ clean: rm -f dbtest$(EXEEXT) dbtest$(EXEEXT): dbtest_dbtest.o dbtest_listdb.o $(__dbtest___win32rc) - $(CXX) -o $@ dbtest_dbtest.o dbtest_listdb.o $(__dbtest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ dbtest_dbtest.o dbtest_listdb.o $(__dbtest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__dbtest___mac_rezcmd) $(__dbtest___mac_setfilecmd) diff --git a/samples/db/makefile.bcc b/samples/db/makefile.bcc new file mode 100644 index 0000000000..f32dd4da0c --- /dev/null +++ b/samples/db/makefile.bcc @@ -0,0 +1,138 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +DBTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\dbtest.exe + +$(OBJS)\dbtest_dbtest.obj: .\dbtest.cpp + $(CXX) -q -c -P -o$@ $(DBTEST_CXXFLAGS) $** + +$(OBJS)\dbtest_dbtest.res: .\dbtest.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +$(OBJS)\dbtest_listdb.obj: .\listdb.cpp + $(CXX) -q -c -P -o$@ $(DBTEST_CXXFLAGS) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\dbtest.exe del $(OBJS)\dbtest.exe + +$(OBJS)\dbtest.exe: $(OBJS)\dbtest_dbtest.obj $(OBJS)\dbtest_listdb.obj $(OBJS)\dbtest_dbtest.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\dbtest_dbtest.obj $(OBJS)\dbtest_listdb.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\dbtest_dbtest.res +| diff --git a/samples/db/makefile.gcc b/samples/db/makefile.gcc index 554a782efb..957426a290 100644 --- a/samples/db/makefile.gcc +++ b/samples/db/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +DBTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -DBTEST_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -127,10 +107,6 @@ clean: -if exist $(OBJS)\dbtest.exe del $(OBJS)\dbtest.exe $(OBJS)\dbtest.exe: $(OBJS)\dbtest_dbtest.o $(OBJS)\dbtest_listdb.o $(OBJS)\dbtest_dbtest_rc.o - $(CXX) -o $@ $(OBJS)\dbtest_dbtest.o $(OBJS)\dbtest_listdb.o $(OBJS)\dbtest_dbtest_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -install: all - -uninstall: + $(CXX) -o $@ $(OBJS)\dbtest_dbtest.o $(OBJS)\dbtest_listdb.o $(OBJS)\dbtest_dbtest_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/db/makefile.vc b/samples/db/makefile.vc index 3d99d37ec8..e163d957d3 100644 --- a/samples/db/makefile.vc +++ b/samples/db/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +DBTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\dbtest.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -DBTEST_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,7 +112,7 @@ $(OBJS)\dbtest_dbtest.obj: .\dbtest.cpp $(CXX) /c /nologo /TP /Fo$@ $(DBTEST_CXXFLAGS) $** $(OBJS)\dbtest_dbtest.res: .\dbtest.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** $(OBJS)\dbtest_listdb.obj: .\listdb.cpp $(CXX) /c /nologo /TP /Fo$@ $(DBTEST_CXXFLAGS) $** @@ -123,10 +123,6 @@ clean: -if exist $(OBJS)\dbtest.exe del $(OBJS)\dbtest.exe $(OBJS)\dbtest.exe: $(OBJS)\dbtest_dbtest.obj $(OBJS)\dbtest_listdb.obj $(OBJS)\dbtest_dbtest.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\dbtest_dbtest.obj $(OBJS)\dbtest_listdb.obj $(OBJS)\dbtest_dbtest.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\dbtest_dbtest.obj $(OBJS)\dbtest_listdb.obj $(OBJS)\dbtest_dbtest.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -install: all - -uninstall: diff --git a/samples/db/makefile.wat b/samples/db/makefile.wat index 264ff584d0..51d403ec2b 100644 --- a/samples/db/makefile.wat +++ b/samples/db/makefile.wat @@ -1,12 +1,150 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = PROGRAM=dbtest -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj $(OUTPUTDIR)\listdb.obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +DBTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\dbtest.exe + +$(OBJS)\dbtest_dbtest.obj : .AUTODEPEND .\dbtest.cpp + $(CXX) -zq -fo=$^@ $(DBTEST_CXXFLAGS) $< + +$(OBJS)\dbtest_dbtest.res : .AUTODEPEND .\dbtest.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +$(OBJS)\dbtest_listdb.obj : .AUTODEPEND .\listdb.cpp + $(CXX) -zq -fo=$^@ $(DBTEST_CXXFLAGS) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\dbtest.exe del $(OBJS)\dbtest.exe + +$(OBJS)\dbtest.exe : $(OBJS)\dbtest_dbtest.obj $(OBJS)\dbtest_listdb.obj $(OBJS)\dbtest_dbtest.res + @%create $(OBJS)\dbtest.lbc + @%append $(OBJS)\dbtest.lbc option quiet + @%append $(OBJS)\dbtest.lbc name $^@ + @%append $(OBJS)\dbtest.lbc option incremental + @%append $(OBJS)\dbtest.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\dbtest_dbtest.obj $(OBJS)\dbtest_listdb.obj) do @%append $(OBJS)\dbtest.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\dbtest.lbc library %i + @%append $(OBJS)\dbtest.lbc option resource=$(OBJS)\dbtest_dbtest.res + wlink @$(OBJS)\dbtest.lbc diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in index a0af6ec53a..a743f7a312 100644 --- a/samples/dialogs/Makefile.in +++ b/samples/dialogs/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -DIALOGS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +DIALOGS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ DIALOGS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o dialogs$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o dialogs$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__dialogs___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__dialogs___mac_setfilecmd = $(SETFILE) -a C dialogs$(EXEEXT) +@COND_PLATFORM_MAC_1@__dialogs___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C dialogs$(EXEEXT) @COND_PLATFORM_WIN32_1@__dialogs___win32rc = dialogs_dialogs_rc.o ### Targets: ### @@ -98,7 +125,7 @@ data: done dialogs$(EXEEXT): dialogs_dialogs.o $(__dialogs___win32rc) - $(CXX) -o $@ dialogs_dialogs.o $(__dialogs___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ dialogs_dialogs.o $(__dialogs___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__dialogs___mac_rezcmd) $(__dialogs___mac_setfilecmd) diff --git a/samples/dialogs/makefile.bcc b/samples/dialogs/makefile.bcc index aea7672dd5..05d76a2c7e 100644 --- a/samples/dialogs/makefile.bcc +++ b/samples/dialogs/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -DIALOGS_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +DIALOGS_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -120,6 +73,18 @@ __OPTIMIZEFLAG_2 = -Od !if "$(BUILD)" == "release" __OPTIMIZEFLAG_2 = -O2 !endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -130,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -167,10 +134,6 @@ data: for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\dialogs.exe: $(OBJS)\dialogs_dialogs.obj $(OBJS)\dialogs_dialogs.res - ilink32 -Tpe $(LDFLAGS) $(__DEBUGFLAG) -tWM -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\dialogs_dialogs.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mti.lib,, $(OBJS)\dialogs_dialogs.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\dialogs_dialogs.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\dialogs_dialogs.res | - -install: all - -uninstall: diff --git a/samples/dialogs/makefile.gcc b/samples/dialogs/makefile.gcc index 0d1daff134..7e070fd258 100644 --- a/samples/dialogs/makefile.gcc +++ b/samples/dialogs/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,8 +12,8 @@ WXUNIV = 0 ### Variables: ### -OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) DIALOGS_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -143,10 +108,6 @@ data: for %%f in (tips.txt) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) $(OBJS)\dialogs.exe: $(OBJS)\dialogs_dialogs.o $(OBJS)\dialogs_dialogs_rc.o - $(CXX) -o $@ $(OBJS)\dialogs_dialogs.o $(OBJS)\dialogs_dialogs_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -install: all - -uninstall: + $(CXX) -o $@ $(OBJS)\dialogs_dialogs.o $(OBJS)\dialogs_dialogs_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all clean install uninstall +.PHONY: all clean diff --git a/samples/dialogs/makefile.vc b/samples/dialogs/makefile.vc index cc5676a09e..8fdacf8f8f 100644 --- a/samples/dialogs/makefile.vc +++ b/samples/dialogs/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +DIALOGS_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\dialogs.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -DIALOGS_CXXFLAGS = $(CPPFLAGS) /MD$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\dialogs.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -101,6 +71,12 @@ __OPTIMIZEFLAG_3 = /Od !if "$(BUILD)" == "release" __OPTIMIZEFLAG_3 = /O2 !endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -149,9 +125,5 @@ data: $(OBJS)\dialogs.exe: $(OBJS)\dialogs_dialogs.obj $(OBJS)\dialogs_dialogs.res link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\dialogs_dialogs.obj $(OBJS)\dialogs_dialogs.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + $(OBJS)\dialogs_dialogs.obj $(OBJS)\dialogs_dialogs.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -install: all - -uninstall: diff --git a/samples/dialogs/makefile.wat b/samples/dialogs/makefile.wat index 0903cc2d4c..854025eecc 100644 --- a/samples/dialogs/makefile.wat +++ b/samples/dialogs/makefile.wat @@ -1,41 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = wpp386 -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include ../../build/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -110,6 +79,13 @@ __OPTIMIZEFLAG_2 = -od !ifeq BUILD release __OPTIMIZEFLAG_2 = -ot -ox !endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif __UNICODE_DEFINE_p = !ifeq UNICODE 1 __UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 @@ -133,8 +109,8 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### +DIALOGS_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -DIALOGS_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm -br -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) @@ -170,10 +146,6 @@ $(OBJS)\dialogs.exe : $(OBJS)\dialogs_dialogs.obj $(OBJS)\dialogs_dialogs.res @%append $(OBJS)\dialogs.lbc option incremental @%append $(OBJS)\dialogs.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' @for %i in ( $(OBJS)\dialogs_dialogs.obj) do @%append $(OBJS)\dialogs.lbc file %i - @for %i in ( $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\dialogs.lbc library %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 wlink @$(OBJS)\dialogs.lbc - -install : .SYMBOLIC all - -uninstall : .SYMBOLIC diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in index f122934763..5625d37ae2 100644 --- a/samples/dialup/Makefile.in +++ b/samples/dialup/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -NETTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +NETTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ NETTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o nettest$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o nettest$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__nettest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__nettest___mac_setfilecmd = $(SETFILE) -a C nettest$(EXEEXT) +@COND_PLATFORM_MAC_1@__nettest___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C nettest$(EXEEXT) @COND_PLATFORM_WIN32_1@__nettest___win32rc = nettest_nettest_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install nettest$(EXEEXT): nettest_nettest.o $(__nettest___win32rc) - $(CXX) -o $@ nettest_nettest.o $(__nettest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ nettest_nettest.o $(__nettest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__nettest___mac_rezcmd) $(__nettest___mac_setfilecmd) diff --git a/samples/dialup/makefile.bcc b/samples/dialup/makefile.bcc index 487bb9db3c..e0318c5931 100644 --- a/samples/dialup/makefile.bcc +++ b/samples/dialup/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -NETTEST_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +NETTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\nettest_nettest.obj: .\nettest.cpp $(CXX) -q -c -P -o$@ $(NETTEST_CXXFLAGS) $** $(OBJS)\nettest_nettest.res: .\nettest.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe -install: all - $(OBJS)\nettest.exe: $(OBJS)\nettest_nettest.obj $(OBJS)\nettest_nettest.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\nettest_nettest.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\nettest_nettest.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\nettest_nettest.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\nettest_nettest.res | - -uninstall: diff --git a/samples/dialup/makefile.gcc b/samples/dialup/makefile.gcc index 3c4ccb71bd..e743eaec1b 100644 --- a/samples/dialup/makefile.gcc +++ b/samples/dialup/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### -NETTEST_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +NETTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe -install: all - $(OBJS)\nettest.exe: $(OBJS)\nettest_nettest.o $(OBJS)\nettest_nettest_rc.o - $(CXX) -o $@ $(OBJS)\nettest_nettest.o $(OBJS)\nettest_nettest_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\nettest_nettest.o $(OBJS)\nettest_nettest_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/dialup/makefile.vc b/samples/dialup/makefile.vc index 81f078cc94..fe363c44db 100644 --- a/samples/dialup/makefile.vc +++ b/samples/dialup/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,7 +12,7 @@ WXUNIV = 0 ### Variables: ### -NETTEST_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +NETTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\nettest.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\nettest_nettest.obj: .\nettest.cpp $(CXX) /c /nologo /TP /Fo$@ $(NETTEST_CXXFLAGS) $** $(OBJS)\nettest_nettest.res: .\nettest.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe -install: all - $(OBJS)\nettest.exe: $(OBJS)\nettest_nettest.obj $(OBJS)\nettest_nettest.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\nettest_nettest.obj $(OBJS)\nettest_nettest.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\nettest_nettest.obj $(OBJS)\nettest_nettest.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/dialup/makefile.wat b/samples/dialup/makefile.wat index ab8b0dc481..580eb4da58 100644 --- a/samples/dialup/makefile.wat +++ b/samples/dialup/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = nettest -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +NETTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\nettest.exe + +$(OBJS)\nettest_nettest.obj : .AUTODEPEND .\nettest.cpp + $(CXX) -zq -fo=$^@ $(NETTEST_CXXFLAGS) $< + +$(OBJS)\nettest_nettest.res : .AUTODEPEND .\nettest.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe + +$(OBJS)\nettest.exe : $(OBJS)\nettest_nettest.obj $(OBJS)\nettest_nettest.res + @%create $(OBJS)\nettest.lbc + @%append $(OBJS)\nettest.lbc option quiet + @%append $(OBJS)\nettest.lbc name $^@ + @%append $(OBJS)\nettest.lbc option incremental + @%append $(OBJS)\nettest.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\nettest_nettest.obj) do @%append $(OBJS)\nettest.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\nettest.lbc diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in index bf730395df..8c33122aa8 100644 --- a/samples/display/Makefile.in +++ b/samples/display/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -DISPLAY_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +DISPLAY_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -56,20 +61,36 @@ DISPLAY_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o display$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o display$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__display___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__display___mac_setfilecmd = $(SETFILE) -a C display$(EXEEXT) +@COND_PLATFORM_MAC_1@__display___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C display$(EXEEXT) ### Targets: ### @@ -81,7 +102,7 @@ clean: rm -f display$(EXEEXT) display$(EXEEXT): display_display.o - $(CXX) -o $@ display_display.o $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ display_display.o $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__display___mac_rezcmd) $(__display___mac_setfilecmd) diff --git a/samples/display/makefile.bcc b/samples/display/makefile.bcc new file mode 100644 index 0000000000..a8b227b1ce --- /dev/null +++ b/samples/display/makefile.bcc @@ -0,0 +1,120 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +DISPLAY_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\display.exe + +$(OBJS)\display_display.obj: .\display.cpp + $(CXX) -q -c -P -o$@ $(DISPLAY_CXXFLAGS) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\display.exe del $(OBJS)\display.exe + +$(OBJS)\display.exe: $(OBJS)\display_display.obj + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\display_display.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, +| diff --git a/samples/display/makefile.gcc b/samples/display/makefile.gcc index 954bacaaf5..82e2d053e9 100644 --- a/samples/display/makefile.gcc +++ b/samples/display/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### -DISPLAY_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +DISPLAY_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,11 +39,23 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(SHARED),1) __DLLFLAG_p = -DWXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -109,10 +89,6 @@ clean: -if exist $(OBJS)\display.exe del $(OBJS)\display.exe $(OBJS)\display.exe: $(OBJS)\display_display.o - $(CXX) -o $@ $(OBJS)\display_display.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -install: all - -uninstall: + $(CXX) -o $@ $(OBJS)\display_display.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/display/makefile.vc b/samples/display/makefile.vc new file mode 100644 index 0000000000..5cbef37811 --- /dev/null +++ b/samples/display/makefile.vc @@ -0,0 +1,110 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +DISPLAY_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\display.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\display.exe + +$(OBJS)\display_display.obj: .\display.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DISPLAY_CXXFLAGS) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\display.exe del $(OBJS)\display.exe + +$(OBJS)\display.exe: $(OBJS)\display_display.obj + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\display_display.obj $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 new file mode 100644 index 0000000000..56a45398ff --- /dev/null +++ b/samples/display/makefile.wat @@ -0,0 +1,144 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +DISPLAY_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\display.exe + +$(OBJS)\display_display.obj : .AUTODEPEND .\display.cpp + $(CXX) -zq -fo=$^@ $(DISPLAY_CXXFLAGS) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\display.exe del $(OBJS)\display.exe + +$(OBJS)\display.exe : $(OBJS)\display_display.obj + @%create $(OBJS)\display.lbc + @%append $(OBJS)\display.lbc option quiet + @%append $(OBJS)\display.lbc name $^@ + @%append $(OBJS)\display.lbc option incremental + @%append $(OBJS)\display.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\display_display.obj) do @%append $(OBJS)\display.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\display.lbc library %i + @%append $(OBJS)\display.lbc + wlink @$(OBJS)\display.lbc diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in index 6c08bbabed..3155770236 100644 --- a/samples/dnd/Makefile.in +++ b/samples/dnd/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -DND_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +DND_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,32 +52,53 @@ DND_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_s @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o dnd$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o dnd$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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__ @@ -102,7 +128,7 @@ distclean: clean rm -f bk-deps shared-ld-sh dnd$(EXEEXT): dnd_dnd.o $(__dnd___win32rc) - $(CXX) -o $@ dnd_dnd.o $(__dnd___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ dnd_dnd.o $(__dnd___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__dnd___mac_rezcmd) $(__dnd___mac_setfilecmd) diff --git a/samples/dnd/makefile.bcc b/samples/dnd/makefile.bcc new file mode 100644 index 0000000000..b482fd3bfc --- /dev/null +++ b/samples/dnd/makefile.bcc @@ -0,0 +1,139 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +DND_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\dnd.exe data + +$(OBJS)\dnd_dnd.obj: .\dnd.cpp + $(CXX) -q -c -P -o$@ $(DND_CXXFLAGS) $** + +$(OBJS)\dnd_dnd.res: .\dnd.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\dnd.exe del $(OBJS)\dnd.exe + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (julian.png dnd.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\dnd.exe: $(OBJS)\dnd_dnd.obj $(OBJS)\dnd_dnd.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\dnd_dnd.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\dnd_dnd.res +| diff --git a/samples/dnd/makefile.gcc b/samples/dnd/makefile.gcc index 8aa93e7d73..2d7e99987b 100644 --- a/samples/dnd/makefile.gcc +++ b/samples/dnd/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +DND_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -DND_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -122,17 +102,12 @@ $(OBJS)\dnd_dnd_rc.o: .\dnd.rc clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\dnd.exe del $(OBJS)\dnd.exe - -if exist $(OBJS)\julian.png $(OBJS)\dnd.wxr del $(OBJS)\julian.png $(OBJS)\dnd.wxr data: if not exist $(OBJS) mkdir $(OBJS) for %%f in (julian.png dnd.wxr) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) $(OBJS)\dnd.exe: $(OBJS)\dnd_dnd.o $(OBJS)\dnd_dnd_rc.o - $(CXX) -o $@ $(OBJS)\dnd_dnd.o $(OBJS)\dnd_dnd_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -install: all - -uninstall: + $(CXX) -o $@ $(OBJS)\dnd_dnd.o $(OBJS)\dnd_dnd_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/dnd/makefile.vc b/samples/dnd/makefile.vc index efe731aa25..7541b66080 100644 --- a/samples/dnd/makefile.vc +++ b/samples/dnd/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +DND_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\dnd.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -DND_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,23 +112,18 @@ $(OBJS)\dnd_dnd.obj: .\dnd.cpp $(CXX) /c /nologo /TP /Fo$@ $(DND_CXXFLAGS) $** $(OBJS)\dnd_dnd.res: .\dnd.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\dnd.exe del $(OBJS)\dnd.exe - -if exist $(OBJS)\julian.png $(OBJS)\dnd.wxr del $(OBJS)\julian.png $(OBJS)\dnd.wxr data: if not exist $(OBJS) mkdir $(OBJS) for %f in (julian.png dnd.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\dnd.exe: $(OBJS)\dnd_dnd.obj $(OBJS)\dnd_dnd.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\dnd_dnd.obj $(OBJS)\dnd_dnd.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\dnd_dnd.obj $(OBJS)\dnd_dnd.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -install: all - -uninstall: diff --git a/samples/dnd/makefile.wat b/samples/dnd/makefile.wat index ded4659684..9306942235 100644 --- a/samples/dnd/makefile.wat +++ b/samples/dnd/makefile.wat @@ -1,12 +1,151 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = dnd -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +DND_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\dnd.exe data + +$(OBJS)\dnd_dnd.obj : .AUTODEPEND .\dnd.cpp + $(CXX) -zq -fo=$^@ $(DND_CXXFLAGS) $< + +$(OBJS)\dnd_dnd.res : .AUTODEPEND .\dnd.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\dnd.exe del $(OBJS)\dnd.exe + +data : + if not exist $(OBJS) mkdir $(OBJS) + for %f in (julian.png dnd.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\dnd.exe : $(OBJS)\dnd_dnd.obj $(OBJS)\dnd_dnd.res + @%create $(OBJS)\dnd.lbc + @%append $(OBJS)\dnd.lbc option quiet + @%append $(OBJS)\dnd.lbc name $^@ + @%append $(OBJS)\dnd.lbc option incremental + @%append $(OBJS)\dnd.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\dnd_dnd.obj) do @%append $(OBJS)\dnd.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\dnd.lbc diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in index 4ee4161fc9..55ed47cd88 100644 --- a/samples/docview/Makefile.in +++ b/samples/docview/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,13 +32,17 @@ top_srcdir = @top_srcdir@ ### Variables: ### -DOCVIEW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +DOCVIEW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) -@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -48,36 +54,59 @@ DOCVIEW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__docview___mac_rezcmd = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o docview$(EXEEXT) $(MACOSX_RESOURCES) chart.r doc.r docview.r mondrian.r -@COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = $(SETFILE) -a C docview$(EXEEXT) +@COND_PLATFORM_MAC_1@__docview___mac_rezcmd = \ +@COND_PLATFORM_MAC_1@ $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_PLATFORM_MAC_1@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_PLATFORM_MAC_1@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_PLATFORM_MAC_1@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) \ +@COND_PLATFORM_MAC_1@ $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o \ +@COND_PLATFORM_MAC_1@ docview$(EXEEXT) $(MACOSX_RESOURCES) chart.r doc.r \ +@COND_PLATFORM_MAC_1@ docview.r mondrian.r +@COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C docview$(EXEEXT) @COND_PLATFORM_WIN32_1@__docview___win32rc = docview_docview_rc.o ### Targets: ### @@ -94,7 +123,7 @@ distclean: clean rm -f bk-deps shared-ld-sh docview$(EXEEXT): docview_docview.o docview_doc.o docview_view.o $(__docview___win32rc) - $(CXX) -o $@ docview_docview.o docview_doc.o docview_view.o $(__docview___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ docview_docview.o docview_doc.o docview_view.o $(__docview___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__docview___mac_rezcmd) $(__docview___mac_setfilecmd) diff --git a/samples/docview/makefile.bcc b/samples/docview/makefile.bcc index 7d3236c0c8..cc7b57fe9d 100644 --- a/samples/docview/makefile.bcc +++ b/samples/docview/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -DOCVIEW_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +DOCVIEW_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -146,7 +125,7 @@ $(OBJS)\docview_docview.obj: .\docview.cpp $(CXX) -q -c -P -o$@ $(DOCVIEW_CXXFLAGS) $** $(OBJS)\docview_docview.res: .\docview.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** $(OBJS)\docview_view.obj: .\view.cpp $(CXX) -q -c -P -o$@ $(DOCVIEW_CXXFLAGS) $** @@ -157,10 +136,6 @@ clean: -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe $(OBJS)\docview.exe: $(OBJS)\docview_docview.obj $(OBJS)\docview_doc.obj $(OBJS)\docview_view.obj $(OBJS)\docview_docview.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\docview_docview.obj $(OBJS)\docview_doc.obj $(OBJS)\docview_view.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\docview_docview.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\docview_docview.obj $(OBJS)\docview_doc.obj $(OBJS)\docview_view.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\docview_docview.res | - -install: all - -uninstall: diff --git a/samples/docview/makefile.gcc b/samples/docview/makefile.gcc index c5bdf72a08..a8b4ba01c5 100644 --- a/samples/docview/makefile.gcc +++ b/samples/docview/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### -DOCVIEW_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +DOCVIEW_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -130,10 +110,6 @@ clean: -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe $(OBJS)\docview.exe: $(OBJS)\docview_docview.o $(OBJS)\docview_doc.o $(OBJS)\docview_view.o $(OBJS)\docview_docview_rc.o - $(CXX) -o $@ $(OBJS)\docview_docview.o $(OBJS)\docview_doc.o $(OBJS)\docview_view.o $(OBJS)\docview_docview_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -install: all - -uninstall: + $(CXX) -o $@ $(OBJS)\docview_docview.o $(OBJS)\docview_doc.o $(OBJS)\docview_view.o $(OBJS)\docview_docview_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/docview/makefile.vc b/samples/docview/makefile.vc index e66a8d6b08..09434e97a5 100644 --- a/samples/docview/makefile.vc +++ b/samples/docview/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,7 +12,7 @@ WXUNIV = 0 ### Variables: ### -DOCVIEW_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +DOCVIEW_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\docview.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -115,7 +115,7 @@ $(OBJS)\docview_docview.obj: .\docview.cpp $(CXX) /c /nologo /TP /Fo$@ $(DOCVIEW_CXXFLAGS) $** $(OBJS)\docview_docview.res: .\docview.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** $(OBJS)\docview_view.obj: .\view.cpp $(CXX) /c /nologo /TP /Fo$@ $(DOCVIEW_CXXFLAGS) $** @@ -126,10 +126,6 @@ clean: -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe $(OBJS)\docview.exe: $(OBJS)\docview_docview.obj $(OBJS)\docview_doc.obj $(OBJS)\docview_view.obj $(OBJS)\docview_docview.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\docview_docview.obj $(OBJS)\docview_doc.obj $(OBJS)\docview_view.obj $(OBJS)\docview_docview.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\docview_docview.obj $(OBJS)\docview_doc.obj $(OBJS)\docview_view.obj $(OBJS)\docview_docview.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -install: all - -uninstall: diff --git a/samples/docview/makefile.wat b/samples/docview/makefile.wat index a86da1fae2..df691f88ed 100644 --- a/samples/docview/makefile.wat +++ b/samples/docview/makefile.wat @@ -1,12 +1,153 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = docview -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj $(OUTPUTDIR)\doc.obj $(OUTPUTDIR)\view.obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +DOCVIEW_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\docview.exe + +$(OBJS)\docview_doc.obj : .AUTODEPEND .\doc.cpp + $(CXX) -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $< + +$(OBJS)\docview_docview.obj : .AUTODEPEND .\docview.cpp + $(CXX) -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $< + +$(OBJS)\docview_docview.res : .AUTODEPEND .\docview.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +$(OBJS)\docview_view.obj : .AUTODEPEND .\view.cpp + $(CXX) -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe + +$(OBJS)\docview.exe : $(OBJS)\docview_docview.obj $(OBJS)\docview_doc.obj $(OBJS)\docview_view.obj $(OBJS)\docview_docview.res + @%create $(OBJS)\docview.lbc + @%append $(OBJS)\docview.lbc option quiet + @%append $(OBJS)\docview.lbc name $^@ + @%append $(OBJS)\docview.lbc option incremental + @%append $(OBJS)\docview.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\docview_docview.obj $(OBJS)\docview_doc.obj $(OBJS)\docview_view.obj) do @%append $(OBJS)\docview.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\docview.lbc diff --git a/samples/docvwmdi/Makefile.in b/samples/docvwmdi/Makefile.in index e1eae71ee2..a759d4fb3c 100644 --- a/samples/docvwmdi/Makefile.in +++ b/samples/docvwmdi/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -DOCVIEW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +DOCVIEW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ DOCVIEW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o docview$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o docview$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__docview___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = $(SETFILE) -a C docview$(EXEEXT) +@COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C docview$(EXEEXT) @COND_PLATFORM_WIN32_1@__docview___win32rc = docview_docview_rc.o ### Targets: ### @@ -94,7 +121,7 @@ distclean: clean rm -f bk-deps shared-ld-sh docview$(EXEEXT): docview_docview.o docview_doc.o docview_view.o $(__docview___win32rc) - $(CXX) -o $@ docview_docview.o docview_doc.o docview_view.o $(__docview___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ docview_docview.o docview_doc.o docview_view.o $(__docview___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__docview___mac_rezcmd) $(__docview___mac_setfilecmd) diff --git a/samples/docvwmdi/makefile.bcc b/samples/docvwmdi/makefile.bcc index 7d3236c0c8..cc7b57fe9d 100644 --- a/samples/docvwmdi/makefile.bcc +++ b/samples/docvwmdi/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -DOCVIEW_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +DOCVIEW_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -146,7 +125,7 @@ $(OBJS)\docview_docview.obj: .\docview.cpp $(CXX) -q -c -P -o$@ $(DOCVIEW_CXXFLAGS) $** $(OBJS)\docview_docview.res: .\docview.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** $(OBJS)\docview_view.obj: .\view.cpp $(CXX) -q -c -P -o$@ $(DOCVIEW_CXXFLAGS) $** @@ -157,10 +136,6 @@ clean: -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe $(OBJS)\docview.exe: $(OBJS)\docview_docview.obj $(OBJS)\docview_doc.obj $(OBJS)\docview_view.obj $(OBJS)\docview_docview.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\docview_docview.obj $(OBJS)\docview_doc.obj $(OBJS)\docview_view.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\docview_docview.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\docview_docview.obj $(OBJS)\docview_doc.obj $(OBJS)\docview_view.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\docview_docview.res | - -install: all - -uninstall: diff --git a/samples/docvwmdi/makefile.gcc b/samples/docvwmdi/makefile.gcc index c5bdf72a08..a8b4ba01c5 100644 --- a/samples/docvwmdi/makefile.gcc +++ b/samples/docvwmdi/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### -DOCVIEW_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +DOCVIEW_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -130,10 +110,6 @@ clean: -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe $(OBJS)\docview.exe: $(OBJS)\docview_docview.o $(OBJS)\docview_doc.o $(OBJS)\docview_view.o $(OBJS)\docview_docview_rc.o - $(CXX) -o $@ $(OBJS)\docview_docview.o $(OBJS)\docview_doc.o $(OBJS)\docview_view.o $(OBJS)\docview_docview_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -install: all - -uninstall: + $(CXX) -o $@ $(OBJS)\docview_docview.o $(OBJS)\docview_doc.o $(OBJS)\docview_view.o $(OBJS)\docview_docview_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/docvwmdi/makefile.vc b/samples/docvwmdi/makefile.vc index e66a8d6b08..09434e97a5 100644 --- a/samples/docvwmdi/makefile.vc +++ b/samples/docvwmdi/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,7 +12,7 @@ WXUNIV = 0 ### Variables: ### -DOCVIEW_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +DOCVIEW_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\docview.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -115,7 +115,7 @@ $(OBJS)\docview_docview.obj: .\docview.cpp $(CXX) /c /nologo /TP /Fo$@ $(DOCVIEW_CXXFLAGS) $** $(OBJS)\docview_docview.res: .\docview.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** $(OBJS)\docview_view.obj: .\view.cpp $(CXX) /c /nologo /TP /Fo$@ $(DOCVIEW_CXXFLAGS) $** @@ -126,10 +126,6 @@ clean: -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe $(OBJS)\docview.exe: $(OBJS)\docview_docview.obj $(OBJS)\docview_doc.obj $(OBJS)\docview_view.obj $(OBJS)\docview_docview.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\docview_docview.obj $(OBJS)\docview_doc.obj $(OBJS)\docview_view.obj $(OBJS)\docview_docview.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\docview_docview.obj $(OBJS)\docview_doc.obj $(OBJS)\docview_view.obj $(OBJS)\docview_docview.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -install: all - -uninstall: diff --git a/samples/docvwmdi/makefile.wat b/samples/docvwmdi/makefile.wat index e30172aea6..df691f88ed 100644 --- a/samples/docvwmdi/makefile.wat +++ b/samples/docvwmdi/makefile.wat @@ -1,12 +1,153 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = docview -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj $(OUTPUTDIR)\doc.obj $(OUTPUTDIR)\view.obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +DOCVIEW_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\docview.exe + +$(OBJS)\docview_doc.obj : .AUTODEPEND .\doc.cpp + $(CXX) -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $< + +$(OBJS)\docview_docview.obj : .AUTODEPEND .\docview.cpp + $(CXX) -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $< + +$(OBJS)\docview_docview.res : .AUTODEPEND .\docview.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +$(OBJS)\docview_view.obj : .AUTODEPEND .\view.cpp + $(CXX) -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe + +$(OBJS)\docview.exe : $(OBJS)\docview_docview.obj $(OBJS)\docview_doc.obj $(OBJS)\docview_view.obj $(OBJS)\docview_docview.res + @%create $(OBJS)\docview.lbc + @%append $(OBJS)\docview.lbc option quiet + @%append $(OBJS)\docview.lbc name $^@ + @%append $(OBJS)\docview.lbc option incremental + @%append $(OBJS)\docview.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\docview_docview.obj $(OBJS)\docview_doc.obj $(OBJS)\docview_view.obj) do @%append $(OBJS)\docview.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\docview.lbc diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in index 7d0b084844..c9ea190370 100644 --- a/samples/dragimag/Makefile.in +++ b/samples/dragimag/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -DRAGIMAG_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +DRAGIMAG_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ DRAGIMAG_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o dragimag$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o dragimag$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__dragimag___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__dragimag___mac_setfilecmd = $(SETFILE) -a C dragimag$(EXEEXT) +@COND_PLATFORM_MAC_1@__dragimag___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C dragimag$(EXEEXT) @COND_PLATFORM_WIN32_1@__dragimag___win32rc = dragimag_dragimag_rc.o ### Targets: ### @@ -102,7 +129,7 @@ distclean: clean rm -f bk-deps shared-ld-sh dragimag$(EXEEXT): dragimag_dragimag.o $(__dragimag___win32rc) - $(CXX) -o $@ dragimag_dragimag.o $(__dragimag___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ dragimag_dragimag.o $(__dragimag___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__dragimag___mac_rezcmd) $(__dragimag___mac_setfilecmd) diff --git a/samples/dragimag/makefile.bcc b/samples/dragimag/makefile.bcc index e03eccda5a..95024f260b 100644 --- a/samples/dragimag/makefile.bcc +++ b/samples/dragimag/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -DRAGIMAG_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +DRAGIMAG_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,23 +122,18 @@ $(OBJS)\dragimag_dragimag.obj: .\dragimag.cpp $(CXX) -q -c -P -o$@ $(DRAGIMAG_CXXFLAGS) $** $(OBJS)\dragimag_dragimag.res: .\dragimag.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\dragimag.exe del $(OBJS)\dragimag.exe - -if exist $(OBJS)\backgrnd.png $(OBJS)\shape01.png $(OBJS)\shape02.png $(OBJS)\shape03.png del $(OBJS)\backgrnd.png $(OBJS)\shape01.png $(OBJS)\shape02.png $(OBJS)\shape03.png data: if not exist $(OBJS) mkdir $(OBJS) for %f in (backgrnd.png shape01.png shape02.png shape03.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\dragimag.exe: $(OBJS)\dragimag_dragimag.obj $(OBJS)\dragimag_dragimag.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\dragimag_dragimag.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\dragimag_dragimag.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\dragimag_dragimag.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\dragimag_dragimag.res | - -install: all - -uninstall: diff --git a/samples/dragimag/makefile.gcc b/samples/dragimag/makefile.gcc index c1d70f1ec2..6970c3279f 100644 --- a/samples/dragimag/makefile.gcc +++ b/samples/dragimag/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +DRAGIMAG_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -DRAGIMAG_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -122,17 +102,12 @@ $(OBJS)\dragimag_dragimag_rc.o: .\dragimag.rc clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\dragimag.exe del $(OBJS)\dragimag.exe - -if exist $(OBJS)\backgrnd.png $(OBJS)\shape01.png $(OBJS)\shape02.png $(OBJS)\shape03.png del $(OBJS)\backgrnd.png $(OBJS)\shape01.png $(OBJS)\shape02.png $(OBJS)\shape03.png data: if not exist $(OBJS) mkdir $(OBJS) for %%f in (backgrnd.png shape01.png shape02.png shape03.png) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) $(OBJS)\dragimag.exe: $(OBJS)\dragimag_dragimag.o $(OBJS)\dragimag_dragimag_rc.o - $(CXX) -o $@ $(OBJS)\dragimag_dragimag.o $(OBJS)\dragimag_dragimag_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -install: all - -uninstall: + $(CXX) -o $@ $(OBJS)\dragimag_dragimag.o $(OBJS)\dragimag_dragimag_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/dragimag/makefile.vc b/samples/dragimag/makefile.vc index 4936f49f72..9c7f47bf33 100644 --- a/samples/dragimag/makefile.vc +++ b/samples/dragimag/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +DRAGIMAG_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\dragimag.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -DRAGIMAG_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,23 +112,18 @@ $(OBJS)\dragimag_dragimag.obj: .\dragimag.cpp $(CXX) /c /nologo /TP /Fo$@ $(DRAGIMAG_CXXFLAGS) $** $(OBJS)\dragimag_dragimag.res: .\dragimag.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\dragimag.exe del $(OBJS)\dragimag.exe - -if exist $(OBJS)\backgrnd.png $(OBJS)\shape01.png $(OBJS)\shape02.png $(OBJS)\shape03.png del $(OBJS)\backgrnd.png $(OBJS)\shape01.png $(OBJS)\shape02.png $(OBJS)\shape03.png data: if not exist $(OBJS) mkdir $(OBJS) for %f in (backgrnd.png shape01.png shape02.png shape03.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\dragimag.exe: $(OBJS)\dragimag_dragimag.obj $(OBJS)\dragimag_dragimag.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\dragimag_dragimag.obj $(OBJS)\dragimag_dragimag.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\dragimag_dragimag.obj $(OBJS)\dragimag_dragimag.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -install: all - -uninstall: diff --git a/samples/dragimag/makefile.wat b/samples/dragimag/makefile.wat index d662867678..7c881e8c5b 100644 --- a/samples/dragimag/makefile.wat +++ b/samples/dragimag/makefile.wat @@ -1,12 +1,151 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = dragimag -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +DRAGIMAG_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\dragimag.exe data + +$(OBJS)\dragimag_dragimag.obj : .AUTODEPEND .\dragimag.cpp + $(CXX) -zq -fo=$^@ $(DRAGIMAG_CXXFLAGS) $< + +$(OBJS)\dragimag_dragimag.res : .AUTODEPEND .\dragimag.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\dragimag.exe del $(OBJS)\dragimag.exe + +data : + if not exist $(OBJS) mkdir $(OBJS) + for %f in (backgrnd.png shape01.png shape02.png shape03.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\dragimag.exe : $(OBJS)\dragimag_dragimag.obj $(OBJS)\dragimag_dragimag.res + @%create $(OBJS)\dragimag.lbc + @%append $(OBJS)\dragimag.lbc option quiet + @%append $(OBJS)\dragimag.lbc name $^@ + @%append $(OBJS)\dragimag.lbc option incremental + @%append $(OBJS)\dragimag.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\dragimag_dragimag.obj) do @%append $(OBJS)\dragimag.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\dragimag.lbc diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in index 3b5c9d8fbb..51d85782c3 100644 --- a/samples/drawing/Makefile.in +++ b/samples/drawing/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -DRAWING_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +DRAWING_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ DRAWING_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o drawing$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o drawing$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__drawing___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__drawing___mac_setfilecmd = $(SETFILE) -a C drawing$(EXEEXT) +@COND_PLATFORM_MAC_1@__drawing___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C drawing$(EXEEXT) @COND_PLATFORM_WIN32_1@__drawing___win32rc = drawing_drawing_rc.o ### Targets: ### @@ -102,7 +129,7 @@ distclean: clean rm -f bk-deps shared-ld-sh drawing$(EXEEXT): drawing_drawing.o $(__drawing___win32rc) - $(CXX) -o $@ drawing_drawing.o $(__drawing___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ drawing_drawing.o $(__drawing___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__drawing___mac_rezcmd) $(__drawing___mac_setfilecmd) diff --git a/samples/drawing/makefile.bcc b/samples/drawing/makefile.bcc index a39422b7b2..83b46ce794 100644 --- a/samples/drawing/makefile.bcc +++ b/samples/drawing/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -DRAWING_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +DRAWING_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,23 +122,18 @@ $(OBJS)\drawing_drawing.obj: .\drawing.cpp $(CXX) -q -c -P -o$@ $(DRAWING_CXXFLAGS) $** $(OBJS)\drawing_drawing.res: .\drawing.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe - -if exist $(OBJS)\pat4.bmp $(OBJS)\pat35.bmp $(OBJS)\pat36.bmp $(OBJS)\image.bmp $(OBJS)\mask.bmp del $(OBJS)\pat4.bmp $(OBJS)\pat35.bmp $(OBJS)\pat36.bmp $(OBJS)\image.bmp $(OBJS)\mask.bmp data: if not exist $(OBJS) mkdir $(OBJS) for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\drawing.exe: $(OBJS)\drawing_drawing.obj $(OBJS)\drawing_drawing.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\drawing_drawing.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\drawing_drawing.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\drawing_drawing.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\drawing_drawing.res | - -install: all - -uninstall: diff --git a/samples/drawing/makefile.gcc b/samples/drawing/makefile.gcc index 4d004daac8..ce65b91fb6 100644 --- a/samples/drawing/makefile.gcc +++ b/samples/drawing/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### -DRAWING_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +DRAWING_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -122,17 +102,12 @@ $(OBJS)\drawing_drawing_rc.o: .\drawing.rc clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe - -if exist $(OBJS)\pat4.bmp $(OBJS)\pat35.bmp $(OBJS)\pat36.bmp $(OBJS)\image.bmp $(OBJS)\mask.bmp del $(OBJS)\pat4.bmp $(OBJS)\pat35.bmp $(OBJS)\pat36.bmp $(OBJS)\image.bmp $(OBJS)\mask.bmp data: if not exist $(OBJS) mkdir $(OBJS) for %%f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) $(OBJS)\drawing.exe: $(OBJS)\drawing_drawing.o $(OBJS)\drawing_drawing_rc.o - $(CXX) -o $@ $(OBJS)\drawing_drawing.o $(OBJS)\drawing_drawing_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -install: all - -uninstall: + $(CXX) -o $@ $(OBJS)\drawing_drawing.o $(OBJS)\drawing_drawing_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/drawing/makefile.vc b/samples/drawing/makefile.vc index 1ca77d15c5..53d899164b 100644 --- a/samples/drawing/makefile.vc +++ b/samples/drawing/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,7 +12,7 @@ WXUNIV = 0 ### Variables: ### -DRAWING_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +DRAWING_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\drawing.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,23 +112,18 @@ $(OBJS)\drawing_drawing.obj: .\drawing.cpp $(CXX) /c /nologo /TP /Fo$@ $(DRAWING_CXXFLAGS) $** $(OBJS)\drawing_drawing.res: .\drawing.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe - -if exist $(OBJS)\pat4.bmp $(OBJS)\pat35.bmp $(OBJS)\pat36.bmp $(OBJS)\image.bmp $(OBJS)\mask.bmp del $(OBJS)\pat4.bmp $(OBJS)\pat35.bmp $(OBJS)\pat36.bmp $(OBJS)\image.bmp $(OBJS)\mask.bmp data: if not exist $(OBJS) mkdir $(OBJS) for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\drawing.exe: $(OBJS)\drawing_drawing.obj $(OBJS)\drawing_drawing.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\drawing_drawing.obj $(OBJS)\drawing_drawing.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\drawing_drawing.obj $(OBJS)\drawing_drawing.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -install: all - -uninstall: diff --git a/samples/drawing/makefile.wat b/samples/drawing/makefile.wat index e1ccc4b117..3d11dd27e2 100644 --- a/samples/drawing/makefile.wat +++ b/samples/drawing/makefile.wat @@ -1,12 +1,151 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = drawing -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +DRAWING_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\drawing.exe data + +$(OBJS)\drawing_drawing.obj : .AUTODEPEND .\drawing.cpp + $(CXX) -zq -fo=$^@ $(DRAWING_CXXFLAGS) $< + +$(OBJS)\drawing_drawing.res : .AUTODEPEND .\drawing.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe + +data : + if not exist $(OBJS) mkdir $(OBJS) + for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\drawing.exe : $(OBJS)\drawing_drawing.obj $(OBJS)\drawing_drawing.res + @%create $(OBJS)\drawing.lbc + @%append $(OBJS)\drawing.lbc option quiet + @%append $(OBJS)\drawing.lbc name $^@ + @%append $(OBJS)\drawing.lbc option incremental + @%append $(OBJS)\drawing.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\drawing_drawing.obj) do @%append $(OBJS)\drawing.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\drawing.lbc diff --git a/samples/dynamic/Makefile.in b/samples/dynamic/Makefile.in index 03262c4625..02259bdb19 100644 --- a/samples/dynamic/Makefile.in +++ b/samples/dynamic/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -DYNAMIC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +DYNAMIC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ DYNAMIC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o dynamic$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o dynamic$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__dynamic___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__dynamic___mac_setfilecmd = $(SETFILE) -a C dynamic$(EXEEXT) +@COND_PLATFORM_MAC_1@__dynamic___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C dynamic$(EXEEXT) @COND_PLATFORM_WIN32_1@__dynamic___win32rc = dynamic_dynamic_rc.o ### Targets: ### @@ -94,7 +121,7 @@ distclean: clean rm -f bk-deps shared-ld-sh dynamic$(EXEEXT): dynamic_dynamic.o $(__dynamic___win32rc) - $(CXX) -o $@ dynamic_dynamic.o $(__dynamic___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ dynamic_dynamic.o $(__dynamic___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__dynamic___mac_rezcmd) $(__dynamic___mac_setfilecmd) diff --git a/samples/dynamic/makefile.bcc b/samples/dynamic/makefile.bcc index c7e03129a5..556d8262f0 100644 --- a/samples/dynamic/makefile.bcc +++ b/samples/dynamic/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -DYNAMIC_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +DYNAMIC_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,7 +122,7 @@ $(OBJS)\dynamic_dynamic.obj: .\dynamic.cpp $(CXX) -q -c -P -o$@ $(DYNAMIC_CXXFLAGS) $** $(OBJS)\dynamic_dynamic.res: .\dynamic.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -151,10 +130,6 @@ clean: -if exist $(OBJS)\dynamic.exe del $(OBJS)\dynamic.exe $(OBJS)\dynamic.exe: $(OBJS)\dynamic_dynamic.obj $(OBJS)\dynamic_dynamic.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\dynamic_dynamic.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\dynamic_dynamic.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\dynamic_dynamic.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\dynamic_dynamic.res | - -install: all - -uninstall: diff --git a/samples/dynamic/makefile.gcc b/samples/dynamic/makefile.gcc index a4b1988ee5..41ae199022 100644 --- a/samples/dynamic/makefile.gcc +++ b/samples/dynamic/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +DYNAMIC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -DYNAMIC_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -124,10 +104,6 @@ clean: -if exist $(OBJS)\dynamic.exe del $(OBJS)\dynamic.exe $(OBJS)\dynamic.exe: $(OBJS)\dynamic_dynamic.o $(OBJS)\dynamic_dynamic_rc.o - $(CXX) -o $@ $(OBJS)\dynamic_dynamic.o $(OBJS)\dynamic_dynamic_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -install: all - -uninstall: + $(CXX) -o $@ $(OBJS)\dynamic_dynamic.o $(OBJS)\dynamic_dynamic_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/dynamic/makefile.vc b/samples/dynamic/makefile.vc index fb6cb23054..4f1ae2b229 100644 --- a/samples/dynamic/makefile.vc +++ b/samples/dynamic/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +DYNAMIC_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\dynamic.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -DYNAMIC_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,7 +112,7 @@ $(OBJS)\dynamic_dynamic.obj: .\dynamic.cpp $(CXX) /c /nologo /TP /Fo$@ $(DYNAMIC_CXXFLAGS) $** $(OBJS)\dynamic_dynamic.res: .\dynamic.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -120,10 +120,6 @@ clean: -if exist $(OBJS)\dynamic.exe del $(OBJS)\dynamic.exe $(OBJS)\dynamic.exe: $(OBJS)\dynamic_dynamic.obj $(OBJS)\dynamic_dynamic.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\dynamic_dynamic.obj $(OBJS)\dynamic_dynamic.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\dynamic_dynamic.obj $(OBJS)\dynamic_dynamic.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -install: all - -uninstall: diff --git a/samples/dynamic/makefile.wat b/samples/dynamic/makefile.wat index 0da994f04e..3beddb16eb 100644 --- a/samples/dynamic/makefile.wat +++ b/samples/dynamic/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = dynamic -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +DYNAMIC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\dynamic.exe + +$(OBJS)\dynamic_dynamic.obj : .AUTODEPEND .\dynamic.cpp + $(CXX) -zq -fo=$^@ $(DYNAMIC_CXXFLAGS) $< + +$(OBJS)\dynamic_dynamic.res : .AUTODEPEND .\dynamic.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\dynamic.exe del $(OBJS)\dynamic.exe + +$(OBJS)\dynamic.exe : $(OBJS)\dynamic_dynamic.obj $(OBJS)\dynamic_dynamic.res + @%create $(OBJS)\dynamic.lbc + @%append $(OBJS)\dynamic.lbc option quiet + @%append $(OBJS)\dynamic.lbc name $^@ + @%append $(OBJS)\dynamic.lbc option incremental + @%append $(OBJS)\dynamic.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\dynamic_dynamic.obj) do @%append $(OBJS)\dynamic.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\dynamic.lbc library %i + @%append $(OBJS)\dynamic.lbc option resource=$(OBJS)\dynamic_dynamic.res + wlink @$(OBJS)\dynamic.lbc diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in index 4c87694654..b75a6f6c17 100644 --- a/samples/erase/Makefile.in +++ b/samples/erase/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -ERASE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +ERASE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ ERASE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o erase$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o erase$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__erase___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__erase___mac_setfilecmd = $(SETFILE) -a C erase$(EXEEXT) +@COND_PLATFORM_MAC_1@__erase___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C erase$(EXEEXT) @COND_PLATFORM_WIN32_1@__erase___win32rc = erase_erase_rc.o ### Targets: ### @@ -94,7 +121,7 @@ distclean: clean rm -f bk-deps shared-ld-sh erase$(EXEEXT): erase_erase.o $(__erase___win32rc) - $(CXX) -o $@ erase_erase.o $(__erase___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ erase_erase.o $(__erase___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__erase___mac_rezcmd) $(__erase___mac_setfilecmd) diff --git a/samples/erase/makefile.bcc b/samples/erase/makefile.bcc index b2110dfb01..b4462b54bd 100644 --- a/samples/erase/makefile.bcc +++ b/samples/erase/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -ERASE_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +ERASE_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,7 +122,7 @@ $(OBJS)\erase_erase.obj: .\erase.cpp $(CXX) -q -c -P -o$@ $(ERASE_CXXFLAGS) $** $(OBJS)\erase_erase.res: .\erase.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -151,10 +130,6 @@ clean: -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe $(OBJS)\erase.exe: $(OBJS)\erase_erase.obj $(OBJS)\erase_erase.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\erase_erase.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\erase_erase.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\erase_erase.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\erase_erase.res | - -install: all - -uninstall: diff --git a/samples/erase/makefile.gcc b/samples/erase/makefile.gcc index 173ea3cd17..1302a90802 100644 --- a/samples/erase/makefile.gcc +++ b/samples/erase/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +ERASE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -ERASE_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -124,10 +104,6 @@ clean: -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe $(OBJS)\erase.exe: $(OBJS)\erase_erase.o $(OBJS)\erase_erase_rc.o - $(CXX) -o $@ $(OBJS)\erase_erase.o $(OBJS)\erase_erase_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -install: all - -uninstall: + $(CXX) -o $@ $(OBJS)\erase_erase.o $(OBJS)\erase_erase_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/erase/makefile.vc b/samples/erase/makefile.vc index 82fb551bb6..e482f142fa 100644 --- a/samples/erase/makefile.vc +++ b/samples/erase/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +ERASE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\erase.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -ERASE_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,7 +112,7 @@ $(OBJS)\erase_erase.obj: .\erase.cpp $(CXX) /c /nologo /TP /Fo$@ $(ERASE_CXXFLAGS) $** $(OBJS)\erase_erase.res: .\erase.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -120,10 +120,6 @@ clean: -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe $(OBJS)\erase.exe: $(OBJS)\erase_erase.obj $(OBJS)\erase_erase.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\erase_erase.obj $(OBJS)\erase_erase.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\erase_erase.obj $(OBJS)\erase_erase.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -install: all - -uninstall: diff --git a/samples/erase/makefile.wat b/samples/erase/makefile.wat index ff0cf3baab..ca801834c0 100644 --- a/samples/erase/makefile.wat +++ b/samples/erase/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = erase -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +ERASE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\erase.exe + +$(OBJS)\erase_erase.obj : .AUTODEPEND .\erase.cpp + $(CXX) -zq -fo=$^@ $(ERASE_CXXFLAGS) $< + +$(OBJS)\erase_erase.res : .AUTODEPEND .\erase.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe + +$(OBJS)\erase.exe : $(OBJS)\erase_erase.obj $(OBJS)\erase_erase.res + @%create $(OBJS)\erase.lbc + @%append $(OBJS)\erase.lbc option quiet + @%append $(OBJS)\erase.lbc name $^@ + @%append $(OBJS)\erase.lbc option incremental + @%append $(OBJS)\erase.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\erase_erase.obj) do @%append $(OBJS)\erase.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\erase.lbc diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in index 33fda99857..2832c5cbe8 100644 --- a/samples/event/Makefile.in +++ b/samples/event/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -EVENT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +EVENT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ EVENT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o event$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o event$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__event___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__event___mac_setfilecmd = $(SETFILE) -a C event$(EXEEXT) +@COND_PLATFORM_MAC_1@__event___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C event$(EXEEXT) @COND_PLATFORM_WIN32_1@__event___win32rc = event_event_rc.o ### Targets: ### @@ -94,7 +121,7 @@ distclean: clean rm -f bk-deps shared-ld-sh event$(EXEEXT): event_event.o $(__event___win32rc) - $(CXX) -o $@ event_event.o $(__event___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ event_event.o $(__event___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__event___mac_rezcmd) $(__event___mac_setfilecmd) diff --git a/samples/event/makefile.bcc b/samples/event/makefile.bcc index f32556ddb9..3c68f1933f 100644 --- a/samples/event/makefile.bcc +++ b/samples/event/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -EVENT_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +EVENT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,7 +122,7 @@ $(OBJS)\event_event.obj: .\event.cpp $(CXX) -q -c -P -o$@ $(EVENT_CXXFLAGS) $** $(OBJS)\event_event.res: .\event.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -151,10 +130,6 @@ clean: -if exist $(OBJS)\event.exe del $(OBJS)\event.exe $(OBJS)\event.exe: $(OBJS)\event_event.obj $(OBJS)\event_event.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\event_event.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\event_event.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\event_event.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\event_event.res | - -install: all - -uninstall: diff --git a/samples/event/makefile.gcc b/samples/event/makefile.gcc index 3dc3cfd18f..4c5f9e1375 100644 --- a/samples/event/makefile.gcc +++ b/samples/event/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### -EVENT_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +EVENT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -124,10 +104,6 @@ clean: -if exist $(OBJS)\event.exe del $(OBJS)\event.exe $(OBJS)\event.exe: $(OBJS)\event_event.o $(OBJS)\event_event_rc.o - $(CXX) -o $@ $(OBJS)\event_event.o $(OBJS)\event_event_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -install: all - -uninstall: + $(CXX) -o $@ $(OBJS)\event_event.o $(OBJS)\event_event_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/event/makefile.vc b/samples/event/makefile.vc index cd4ffabfa7..173a33e0f7 100644 --- a/samples/event/makefile.vc +++ b/samples/event/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,7 +12,7 @@ WXUNIV = 0 ### Variables: ### -EVENT_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +EVENT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\event.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,7 +112,7 @@ $(OBJS)\event_event.obj: .\event.cpp $(CXX) /c /nologo /TP /Fo$@ $(EVENT_CXXFLAGS) $** $(OBJS)\event_event.res: .\event.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -120,10 +120,6 @@ clean: -if exist $(OBJS)\event.exe del $(OBJS)\event.exe $(OBJS)\event.exe: $(OBJS)\event_event.obj $(OBJS)\event_event.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\event_event.obj $(OBJS)\event_event.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\event_event.obj $(OBJS)\event_event.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -install: all - -uninstall: diff --git a/samples/event/makefile.wat b/samples/event/makefile.wat index c5c56131fb..00573f2339 100644 --- a/samples/event/makefile.wat +++ b/samples/event/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = event -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +EVENT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\event.exe + +$(OBJS)\event_event.obj : .AUTODEPEND .\event.cpp + $(CXX) -zq -fo=$^@ $(EVENT_CXXFLAGS) $< + +$(OBJS)\event_event.res : .AUTODEPEND .\event.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\event.exe del $(OBJS)\event.exe + +$(OBJS)\event.exe : $(OBJS)\event_event.obj $(OBJS)\event_event.res + @%create $(OBJS)\event.lbc + @%append $(OBJS)\event.lbc option quiet + @%append $(OBJS)\event.lbc name $^@ + @%append $(OBJS)\event.lbc option incremental + @%append $(OBJS)\event.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\event_event.obj) do @%append $(OBJS)\event.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\event.lbc diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in index 8a33fb14a5..1c65312d69 100644 --- a/samples/exec/Makefile.in +++ b/samples/exec/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -EXEC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +EXEC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ EXEC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_ @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o exec$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o exec$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__exec___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__exec___mac_setfilecmd = $(SETFILE) -a C exec$(EXEEXT) +@COND_PLATFORM_MAC_1@__exec___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C exec$(EXEEXT) @COND_PLATFORM_WIN32_1@__exec___win32rc = exec_exec_rc.o ### Targets: ### @@ -94,7 +121,7 @@ distclean: clean rm -f bk-deps shared-ld-sh exec$(EXEEXT): exec_exec.o $(__exec___win32rc) - $(CXX) -o $@ exec_exec.o $(__exec___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ exec_exec.o $(__exec___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__exec___mac_rezcmd) $(__exec___mac_setfilecmd) diff --git a/samples/exec/makefile.bcc b/samples/exec/makefile.bcc index bd3649502a..ec83844a77 100644 --- a/samples/exec/makefile.bcc +++ b/samples/exec/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -EXEC_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +EXEC_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,7 +122,7 @@ $(OBJS)\exec_exec.obj: .\exec.cpp $(CXX) -q -c -P -o$@ $(EXEC_CXXFLAGS) $** $(OBJS)\exec_exec.res: .\exec.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -151,10 +130,6 @@ clean: -if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe $(OBJS)\exec.exe: $(OBJS)\exec_exec.obj $(OBJS)\exec_exec.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\exec_exec.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\exec_exec.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\exec_exec.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\exec_exec.res | - -install: all - -uninstall: diff --git a/samples/exec/makefile.gcc b/samples/exec/makefile.gcc index 1c35f921d3..f5e8559cae 100644 --- a/samples/exec/makefile.gcc +++ b/samples/exec/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +EXEC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -EXEC_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -124,10 +104,6 @@ clean: -if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe $(OBJS)\exec.exe: $(OBJS)\exec_exec.o $(OBJS)\exec_exec_rc.o - $(CXX) -o $@ $(OBJS)\exec_exec.o $(OBJS)\exec_exec_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -install: all - -uninstall: + $(CXX) -o $@ $(OBJS)\exec_exec.o $(OBJS)\exec_exec_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/exec/makefile.vc b/samples/exec/makefile.vc index eba499c8f4..d84e255803 100644 --- a/samples/exec/makefile.vc +++ b/samples/exec/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +EXEC_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\exec.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -EXEC_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,7 +112,7 @@ $(OBJS)\exec_exec.obj: .\exec.cpp $(CXX) /c /nologo /TP /Fo$@ $(EXEC_CXXFLAGS) $** $(OBJS)\exec_exec.res: .\exec.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -120,10 +120,6 @@ clean: -if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe $(OBJS)\exec.exe: $(OBJS)\exec_exec.obj $(OBJS)\exec_exec.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\exec_exec.obj $(OBJS)\exec_exec.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\exec_exec.obj $(OBJS)\exec_exec.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -install: all - -uninstall: diff --git a/samples/exec/makefile.wat b/samples/exec/makefile.wat index 7a7f01dbb7..957e5daaf2 100644 --- a/samples/exec/makefile.wat +++ b/samples/exec/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = exec -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +EXEC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\exec.exe + +$(OBJS)\exec_exec.obj : .AUTODEPEND .\exec.cpp + $(CXX) -zq -fo=$^@ $(EXEC_CXXFLAGS) $< + +$(OBJS)\exec_exec.res : .AUTODEPEND .\exec.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe + +$(OBJS)\exec.exe : $(OBJS)\exec_exec.obj $(OBJS)\exec_exec.res + @%create $(OBJS)\exec.lbc + @%append $(OBJS)\exec.lbc option quiet + @%append $(OBJS)\exec.lbc name $^@ + @%append $(OBJS)\exec.lbc option incremental + @%append $(OBJS)\exec.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\exec_exec.obj) do @%append $(OBJS)\exec.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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_exec.res + wlink @$(OBJS)\exec.lbc diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in index 2ed71012f7..5f6d3c6916 100644 --- a/samples/font/Makefile.in +++ b/samples/font/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -FONT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +FONT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ FONT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_ @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o font$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o font$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__font___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__font___mac_setfilecmd = $(SETFILE) -a C font$(EXEEXT) +@COND_PLATFORM_MAC_1@__font___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C font$(EXEEXT) @COND_PLATFORM_WIN32_1@__font___win32rc = font_font_rc.o ### Targets: ### @@ -94,7 +121,7 @@ distclean: clean rm -f bk-deps shared-ld-sh font$(EXEEXT): font_font.o $(__font___win32rc) - $(CXX) -o $@ font_font.o $(__font___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ font_font.o $(__font___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__font___mac_rezcmd) $(__font___mac_setfilecmd) diff --git a/samples/font/makefile.bcc b/samples/font/makefile.bcc index 2a78019239..2f0445c3bf 100644 --- a/samples/font/makefile.bcc +++ b/samples/font/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -FONT_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +FONT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,7 +122,7 @@ $(OBJS)\font_font.obj: .\font.cpp $(CXX) -q -c -P -o$@ $(FONT_CXXFLAGS) $** $(OBJS)\font_font.res: .\font.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -151,10 +130,6 @@ clean: -if exist $(OBJS)\font.exe del $(OBJS)\font.exe $(OBJS)\font.exe: $(OBJS)\font_font.obj $(OBJS)\font_font.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\font_font.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\font_font.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\font_font.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\font_font.res | - -install: all - -uninstall: diff --git a/samples/font/makefile.gcc b/samples/font/makefile.gcc index 2cb70a4e3e..3b2e2ff0a1 100644 --- a/samples/font/makefile.gcc +++ b/samples/font/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +FONT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -FONT_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -124,10 +104,6 @@ clean: -if exist $(OBJS)\font.exe del $(OBJS)\font.exe $(OBJS)\font.exe: $(OBJS)\font_font.o $(OBJS)\font_font_rc.o - $(CXX) -o $@ $(OBJS)\font_font.o $(OBJS)\font_font_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -install: all - -uninstall: + $(CXX) -o $@ $(OBJS)\font_font.o $(OBJS)\font_font_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/font/makefile.vc b/samples/font/makefile.vc index 207044ffa0..08a856c6a2 100644 --- a/samples/font/makefile.vc +++ b/samples/font/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +FONT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\font.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -FONT_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,7 +112,7 @@ $(OBJS)\font_font.obj: .\font.cpp $(CXX) /c /nologo /TP /Fo$@ $(FONT_CXXFLAGS) $** $(OBJS)\font_font.res: .\font.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -120,10 +120,6 @@ clean: -if exist $(OBJS)\font.exe del $(OBJS)\font.exe $(OBJS)\font.exe: $(OBJS)\font_font.obj $(OBJS)\font_font.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\font_font.obj $(OBJS)\font_font.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\font_font.obj $(OBJS)\font_font.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -install: all - -uninstall: diff --git a/samples/font/makefile.wat b/samples/font/makefile.wat index 085e6e463c..562d710eb7 100644 --- a/samples/font/makefile.wat +++ b/samples/font/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = font -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +FONT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\font.exe + +$(OBJS)\font_font.obj : .AUTODEPEND .\font.cpp + $(CXX) -zq -fo=$^@ $(FONT_CXXFLAGS) $< + +$(OBJS)\font_font.res : .AUTODEPEND .\font.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\font.exe del $(OBJS)\font.exe + +$(OBJS)\font.exe : $(OBJS)\font_font.obj $(OBJS)\font_font.res + @%create $(OBJS)\font.lbc + @%append $(OBJS)\font.lbc option quiet + @%append $(OBJS)\font.lbc name $^@ + @%append $(OBJS)\font.lbc option incremental + @%append $(OBJS)\font.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\font_font.obj) do @%append $(OBJS)\font.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\font.lbc diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in index 0bd4bcc7e9..36940ffaa3 100644 --- a/samples/grid/Makefile.in +++ b/samples/grid/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -GRID_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +GRID_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ GRID_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_ @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o grid$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o grid$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__grid___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__grid___mac_setfilecmd = $(SETFILE) -a C grid$(EXEEXT) +@COND_PLATFORM_MAC_1@__grid___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C grid$(EXEEXT) @COND_PLATFORM_WIN32_1@__grid___win32rc = grid_griddemo_rc.o ### Targets: ### @@ -94,7 +121,7 @@ distclean: clean rm -f bk-deps shared-ld-sh grid$(EXEEXT): grid_griddemo.o $(__grid___win32rc) - $(CXX) -o $@ grid_griddemo.o $(__grid___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ grid_griddemo.o $(__grid___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__grid___mac_rezcmd) $(__grid___mac_setfilecmd) diff --git a/samples/grid/makefile.bcc b/samples/grid/makefile.bcc index 558f13b125..a8f7aa1a00 100644 --- a/samples/grid/makefile.bcc +++ b/samples/grid/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -GRID_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +GRID_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -139,22 +118,18 @@ $(OBJS): all: $(OBJS)\grid.exe -$(OBJS)\grid_grid.res: .\grid.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** - $(OBJS)\grid_griddemo.obj: .\griddemo.cpp $(CXX) -q -c -P -o$@ $(GRID_CXXFLAGS) $** +$(OBJS)\grid_griddemo.res: .\griddemo.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe -$(OBJS)\grid.exe: $(OBJS)\grid_griddemo.obj $(OBJS)\grid_grid.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\grid_griddemo.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\grid_grid.res +$(OBJS)\grid.exe: $(OBJS)\grid_griddemo.obj $(OBJS)\grid_griddemo.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\grid_griddemo.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\grid_griddemo.res | - -install: all - -uninstall: diff --git a/samples/grid/makefile.gcc b/samples/grid/makefile.gcc index 71918a639a..13276f8a1b 100644 --- a/samples/grid/makefile.gcc +++ b/samples/grid/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +GRID_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -GRID_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -124,10 +104,6 @@ clean: -if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe $(OBJS)\grid.exe: $(OBJS)\grid_griddemo.o $(OBJS)\grid_griddemo_rc.o - $(CXX) -o $@ $(OBJS)\grid_griddemo.o $(OBJS)\grid_griddemo_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -install: all - -uninstall: + $(CXX) -o $@ $(OBJS)\grid_griddemo.o $(OBJS)\grid_griddemo_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/grid/makefile.vc b/samples/grid/makefile.vc index 38124496ec..65caa7ceee 100644 --- a/samples/grid/makefile.vc +++ b/samples/grid/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +GRID_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\grid.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -GRID_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -108,22 +108,18 @@ $(OBJS): all: $(OBJS)\grid.exe -$(OBJS)\grid_grid.res: .\grid.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** - $(OBJS)\grid_griddemo.obj: .\griddemo.cpp $(CXX) /c /nologo /TP /Fo$@ $(GRID_CXXFLAGS) $** +$(OBJS)\grid_griddemo.res: .\griddemo.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** + clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe -$(OBJS)\grid.exe: $(OBJS)\grid_griddemo.obj $(OBJS)\grid_grid.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\grid_griddemo.obj $(OBJS)\grid_grid.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib +$(OBJS)\grid.exe: $(OBJS)\grid_griddemo.obj $(OBJS)\grid_griddemo.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\grid_griddemo.obj $(OBJS)\grid_griddemo.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -install: all - -uninstall: diff --git a/samples/grid/makefile.wat b/samples/grid/makefile.wat index a9edce43dc..99e854eee0 100644 --- a/samples/grid/makefile.wat +++ b/samples/grid/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = grid -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +GRID_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\grid.exe + +$(OBJS)\grid_griddemo.obj : .AUTODEPEND .\griddemo.cpp + $(CXX) -zq -fo=$^@ $(GRID_CXXFLAGS) $< + +$(OBJS)\grid_griddemo.res : .AUTODEPEND .\griddemo.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe + +$(OBJS)\grid.exe : $(OBJS)\grid_griddemo.obj $(OBJS)\grid_griddemo.res + @%create $(OBJS)\grid.lbc + @%append $(OBJS)\grid.lbc option quiet + @%append $(OBJS)\grid.lbc name $^@ + @%append $(OBJS)\grid.lbc option incremental + @%append $(OBJS)\grid.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\grid_griddemo.obj) do @%append $(OBJS)\grid.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\grid.lbc diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in index c433251170..d4f35e0329 100644 --- a/samples/help/Makefile.in +++ b/samples/help/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -HELP_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +HELP_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,38 +52,60 @@ HELP_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_ @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o help$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o help$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__help___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__help___mac_setfilecmd = $(SETFILE) -a C help$(EXEEXT) -@COND_PLATFORM_WIN32_1@__help___win32rc = help_help_rc.o +@COND_PLATFORM_MAC_1@__help___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C help$(EXEEXT) +@COND_PLATFORM_WIN32_1@__help___win32rc = help_demo_rc.o ### Targets: ### @@ -94,14 +121,14 @@ distclean: clean rm -f bk-deps shared-ld-sh help$(EXEEXT): help_demo.o $(__help___win32rc) - $(CXX) -o $@ help_demo.o $(__help___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ help_demo.o $(__help___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__help___mac_rezcmd) $(__help___mac_setfilecmd) help_demo.o: $(srcdir)/demo.cpp $(CXXC) -c -o $@ $(HELP_CXXFLAGS) $< -help_help_rc.o: $(srcdir)/help.rc +help_demo_rc.o: $(srcdir)/demo.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) install: all diff --git a/samples/help/makefile.bcc b/samples/help/makefile.bcc index 86a0987abd..e667dfe2b6 100644 --- a/samples/help/makefile.bcc +++ b/samples/help/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -HELP_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +HELP_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -142,19 +121,15 @@ all: $(OBJS)\help.exe $(OBJS)\help_demo.obj: .\demo.cpp $(CXX) -q -c -P -o$@ $(HELP_CXXFLAGS) $** -$(OBJS)\help_help.res: .\help.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** +$(OBJS)\help_demo.res: .\demo.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\help.exe del $(OBJS)\help.exe -$(OBJS)\help.exe: $(OBJS)\help_demo.obj $(OBJS)\help_help.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\help_demo.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\help_help.res +$(OBJS)\help.exe: $(OBJS)\help_demo.obj $(OBJS)\help_demo.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\help_demo.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\help_demo.res | - -install: all - -uninstall: diff --git a/samples/help/makefile.gcc b/samples/help/makefile.gcc index fc384a28ba..2578fcaa90 100644 --- a/samples/help/makefile.gcc +++ b/samples/help/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### -HELP_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +HELP_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -116,18 +96,14 @@ all: $(OBJS)\help.exe $(OBJS)\help_demo.o: .\demo.cpp $(CXX) -c -o $@ $(HELP_CXXFLAGS) $< -$(OBJS)\help_help_rc.o: .\help.rc +$(OBJS)\help_demo_rc.o: .\demo.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir ./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib --include-dir ./../../src/regex --include-dir . $(__DLLFLAG_p_1) clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\help.exe del $(OBJS)\help.exe -$(OBJS)\help.exe: $(OBJS)\help_demo.o $(OBJS)\help_help_rc.o - $(CXX) -o $@ $(OBJS)\help_demo.o $(OBJS)\help_help_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -install: all - -uninstall: +$(OBJS)\help.exe: $(OBJS)\help_demo.o $(OBJS)\help_demo_rc.o + $(CXX) -o $@ $(OBJS)\help_demo.o $(OBJS)\help_demo_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/help/makefile.vc b/samples/help/makefile.vc index 3cb79421cf..310b15b530 100644 --- a/samples/help/makefile.vc +++ b/samples/help/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,7 +12,7 @@ WXUNIV = 0 ### Variables: ### -HELP_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +HELP_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\help.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -111,19 +111,15 @@ all: $(OBJS)\help.exe $(OBJS)\help_demo.obj: .\demo.cpp $(CXX) /c /nologo /TP /Fo$@ $(HELP_CXXFLAGS) $** -$(OBJS)\help_help.res: .\help.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** +$(OBJS)\help_demo.res: .\demo.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\help.exe del $(OBJS)\help.exe -$(OBJS)\help.exe: $(OBJS)\help_demo.obj $(OBJS)\help_help.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\help_demo.obj $(OBJS)\help_help.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib +$(OBJS)\help.exe: $(OBJS)\help_demo.obj $(OBJS)\help_demo.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\help_demo.obj $(OBJS)\help_demo.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -install: all - -uninstall: diff --git a/samples/help/makefile.wat b/samples/help/makefile.wat index 1863cda4a2..b662deb030 100644 --- a/samples/help/makefile.wat +++ b/samples/help/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = demo -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +HELP_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\help.exe + +$(OBJS)\help_demo.obj : .AUTODEPEND .\demo.cpp + $(CXX) -zq -fo=$^@ $(HELP_CXXFLAGS) $< + +$(OBJS)\help_demo.res : .AUTODEPEND .\demo.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\help.exe del $(OBJS)\help.exe + +$(OBJS)\help.exe : $(OBJS)\help_demo.obj $(OBJS)\help_demo.res + @%create $(OBJS)\help.lbc + @%append $(OBJS)\help.lbc option quiet + @%append $(OBJS)\help.lbc name $^@ + @%append $(OBJS)\help.lbc option incremental + @%append $(OBJS)\help.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\help_demo.obj) do @%append $(OBJS)\help.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\help.lbc diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in index 45790d2c41..b800698606 100644 --- a/samples/htlbox/Makefile.in +++ b/samples/htlbox/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -HTLBOX_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +HTLBOX_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,38 +52,61 @@ HTLBOX_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(to @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o htlbox$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_0@__WXLIB_HTML_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o htlbox$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_HTML_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__htlbox___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__htlbox___mac_setfilecmd = $(SETFILE) -a C htlbox$(EXEEXT) +@COND_PLATFORM_MAC_1@__htlbox___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C htlbox$(EXEEXT) @COND_PLATFORM_WIN32_1@__htlbox___win32rc = htlbox_htlbox_rc.o ### Targets: ### @@ -95,7 +123,7 @@ distclean: clean rm -f bk-deps shared-ld-sh htlbox$(EXEEXT): htlbox_htlbox.o $(__htlbox___win32rc) - $(CXX) -o $@ htlbox_htlbox.o $(__htlbox___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ htlbox_htlbox.o $(__htlbox___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__htlbox___mac_rezcmd) $(__htlbox___mac_setfilecmd) diff --git a/samples/htlbox/makefile.bcc b/samples/htlbox/makefile.bcc new file mode 100644 index 0000000000..f233c8e236 --- /dev/null +++ b/samples/htlbox/makefile.bcc @@ -0,0 +1,139 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +HTLBOX_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\htlbox.exe + +$(OBJS)\htlbox_htlbox.obj: .\htlbox.cpp + $(CXX) -q -c -P -o$@ $(HTLBOX_CXXFLAGS) $** + +$(OBJS)\htlbox_htlbox.res: .\htlbox.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe + +$(OBJS)\htlbox.exe: $(OBJS)\htlbox_htlbox.obj $(OBJS)\htlbox_htlbox.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\htlbox_htlbox.obj,$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\htlbox_htlbox.res +| diff --git a/samples/htlbox/makefile.gcc b/samples/htlbox/makefile.gcc index 00198fbb20..4e42e54356 100644 --- a/samples/htlbox/makefile.gcc +++ b/samples/htlbox/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### -HTLBOX_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +HTLBOX_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -94,6 +74,9 @@ endif ifeq ($(MONOLITHIC),0) __WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core endif +ifeq ($(MONOLITHIC),0) +__WXLIB_HTML_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html +endif ifeq ($(MONOLITHIC),1) __WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) endif @@ -124,10 +107,6 @@ clean: -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe $(OBJS)\htlbox.exe: $(OBJS)\htlbox_htlbox.o $(OBJS)\htlbox_htlbox_rc.o - $(CXX) -o $@ $(OBJS)\htlbox_htlbox.o $(OBJS)\htlbox_htlbox_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -install: all - -uninstall: + $(CXX) -o $@ $(OBJS)\htlbox_htlbox.o $(OBJS)\htlbox_htlbox_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/htlbox/makefile.vc b/samples/htlbox/makefile.vc new file mode 100644 index 0000000000..77f8c6e30d --- /dev/null +++ b/samples/htlbox/makefile.vc @@ -0,0 +1,128 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +HTLBOX_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\htlbox.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = /d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\htlbox.exe + +$(OBJS)\htlbox_htlbox.obj: .\htlbox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(HTLBOX_CXXFLAGS) $** + +$(OBJS)\htlbox_htlbox.res: .\htlbox.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe + +$(OBJS)\htlbox.exe: $(OBJS)\htlbox_htlbox.obj $(OBJS)\htlbox_htlbox.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\htlbox_htlbox.obj $(OBJS)\htlbox_htlbox.res $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 new file mode 100644 index 0000000000..2551608024 --- /dev/null +++ b/samples/htlbox/makefile.wat @@ -0,0 +1,151 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +HTLBOX_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\htlbox.exe + +$(OBJS)\htlbox_htlbox.obj : .AUTODEPEND .\htlbox.cpp + $(CXX) -zq -fo=$^@ $(HTLBOX_CXXFLAGS) $< + +$(OBJS)\htlbox_htlbox.res : .AUTODEPEND .\htlbox.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe + +$(OBJS)\htlbox.exe : $(OBJS)\htlbox_htlbox.obj $(OBJS)\htlbox_htlbox.res + @%create $(OBJS)\htlbox.lbc + @%append $(OBJS)\htlbox.lbc option quiet + @%append $(OBJS)\htlbox.lbc name $^@ + @%append $(OBJS)\htlbox.lbc option incremental + @%append $(OBJS)\htlbox.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\htlbox_htlbox.obj) do @%append $(OBJS)\htlbox.lbc file %i + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\htlbox.lbc diff --git a/samples/html/Makefile.in b/samples/html/Makefile.in index 7fb3482f69..4dbfd1dd50 100644 --- a/samples/html/Makefile.in +++ b/samples/html/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in index e579694f6f..3f22764ee6 100644 --- a/samples/html/about/Makefile.in +++ b/samples/html/about/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -ABOUT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +ABOUT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,38 +52,61 @@ ABOUT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o about$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_0@__WXLIB_HTML_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o about$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_HTML_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__about___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__about___mac_setfilecmd = $(SETFILE) -a C about$(EXEEXT) +@COND_PLATFORM_MAC_1@__about___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C about$(EXEEXT) @COND_PLATFORM_WIN32_1@__about___win32rc = about_about_rc.o ### Targets: ### @@ -86,7 +114,7 @@ ABOUT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top all: about$(EXEEXT) data about$(EXEEXT): about_about.o $(__about___win32rc) - $(CXX) -o $@ about_about.o $(__about___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ about_about.o $(__about___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__about___mac_rezcmd) $(__about___mac_setfilecmd) diff --git a/samples/html/about/makefile.bcc b/samples/html/about/makefile.bcc new file mode 100644 index 0000000000..b143221a9e --- /dev/null +++ b/samples/html/about/makefile.bcc @@ -0,0 +1,143 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +ABOUT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ + -I.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ + -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\about.exe data + +$(OBJS)\about_about.obj: .\about.cpp + $(CXX) -q -c -P -o$@ $(ABOUT_CXXFLAGS) $** + +$(OBJS)\about_about.res: .\about.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib -i.\..\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +$(OBJS)\about.exe: $(OBJS)\about_about.obj $(OBJS)\about_about.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\about_about.obj,$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\about_about.res +| + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\about.exe del $(OBJS)\about.exe + +data: + if not exist $(OBJS)/data mkdir $(OBJS)/data + for %f in (about.htm logo.png) do if not exist $(OBJS)/data\%f copy ./data\%f $(OBJS)/data diff --git a/samples/html/about/makefile.gcc b/samples/html/about/makefile.gcc new file mode 100644 index 0000000000..3ae2185252 --- /dev/null +++ b/samples/html/about/makefile.gcc @@ -0,0 +1,116 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +ABOUT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p_1 = --define __WXDEBUG__ +endif +ifeq ($(SHARED),1) +__DLLFLAG_p = -DWXUSINGDLL +endif +ifeq ($(SHARED),1) +__DLLFLAG_p_1 = --define WXUSINGDLL +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_HTML_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\about.exe data + +$(OBJS)\about_about.o: .\about.cpp + $(CXX) -c -o $@ $(ABOUT_CXXFLAGS) $< + +$(OBJS)\about_about_rc.o: .\about.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir ./../../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib --include-dir ./../../../src/regex --include-dir . $(__DLLFLAG_p_1) + +$(OBJS)\about.exe: $(OBJS)\about_about.o $(OBJS)\about_about_rc.o + $(CXX) -o $@ $(OBJS)\about_about.o $(OBJS)\about_about_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist $(OBJS)\about.exe del $(OBJS)\about.exe + +data: + if not exist $(OBJS)/data mkdir $(OBJS)/data + for %%f in (about.htm logo.png) do if not exist $(OBJS)/data\%%f copy ./data\%%f $(OBJS)/data + +.PHONY: all clean diff --git a/samples/html/about/makefile.vc b/samples/html/about/makefile.vc new file mode 100644 index 0000000000..c7e26a40e3 --- /dev/null +++ b/samples/html/about/makefile.vc @@ -0,0 +1,132 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +ABOUT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\about.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = /d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\about.exe data + +$(OBJS)\about_about.obj: .\about.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ABOUT_CXXFLAGS) $** + +$(OBJS)\about_about.res: .\about.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\..\include /i.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\..\src\tiff /i.\..\..\..\src\jpeg /i.\..\..\..\src\png /i.\..\..\..\src\zlib /i.\..\..\..\src\regex /i. $(__DLLFLAG_p_1) $** + +$(OBJS)\about.exe: $(OBJS)\about_about.obj $(OBJS)\about_about.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\about_about.obj $(OBJS)\about_about.res $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib +<< + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\about.exe del $(OBJS)\about.exe + +data: + if not exist $(OBJS)/data mkdir $(OBJS)/data + for %f in (about.htm logo.png) do if not exist $(OBJS)/data\%f copy ./data\%f $(OBJS)/data diff --git a/samples/html/about/makefile.wat b/samples/html/about/makefile.wat index 1234ed9fe8..b534bc035d 100644 --- a/samples/html/about/makefile.wat +++ b/samples/html/about/makefile.wat @@ -1,12 +1,155 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = about -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +ABOUT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\about.exe data + +$(OBJS)\about_about.obj : .AUTODEPEND .\about.cpp + $(CXX) -zq -fo=$^@ $(ABOUT_CXXFLAGS) $< + +$(OBJS)\about_about.res : .AUTODEPEND .\about.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +$(OBJS)\about.exe : $(OBJS)\about_about.obj $(OBJS)\about_about.res + @%create $(OBJS)\about.lbc + @%append $(OBJS)\about.lbc option quiet + @%append $(OBJS)\about.lbc name $^@ + @%append $(OBJS)\about.lbc option incremental + @%append $(OBJS)\about.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\about_about.obj) do @%append $(OBJS)\about.lbc file %i + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\about.lbc + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\about.exe del $(OBJS)\about.exe + +data : + if not exist $(OBJS)/data mkdir $(OBJS)/data + for %f in (about.htm logo.png) do if not exist $(OBJS)/data\%f copy ./data\%f $(OBJS)/data diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in index fa700b7321..2020b7558a 100644 --- a/samples/html/help/Makefile.in +++ b/samples/html/help/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -HELP_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +HELP_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,38 +52,61 @@ HELP_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_ @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o help$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_0@__WXLIB_HTML_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o help$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_HTML_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__help___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__help___mac_setfilecmd = $(SETFILE) -a C help$(EXEEXT) +@COND_PLATFORM_MAC_1@__help___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C help$(EXEEXT) @COND_PLATFORM_WIN32_1@__help___win32rc = help_help_rc.o ### Targets: ### @@ -103,7 +131,7 @@ distclean: clean rm -f bk-deps shared-ld-sh help$(EXEEXT): help_help.o $(__help___win32rc) - $(CXX) -o $@ help_help.o $(__help___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ help_help.o $(__help___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__help___mac_rezcmd) $(__help___mac_setfilecmd) diff --git a/samples/html/help/makefile.bcc b/samples/html/help/makefile.bcc new file mode 100644 index 0000000000..fc12a3e6cd --- /dev/null +++ b/samples/html/help/makefile.bcc @@ -0,0 +1,143 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +HELP_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ + -I.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ + -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\help.exe data + +$(OBJS)\help_help.obj: .\help.cpp + $(CXX) -q -c -P -o$@ $(HELP_CXXFLAGS) $** + +$(OBJS)\help_help.res: .\help.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib -i.\..\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\help.exe del $(OBJS)\help.exe + +data: + if not exist $(OBJS)/helpfiles mkdir $(OBJS)/helpfiles + for %f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)/helpfiles\%f copy ./helpfiles\%f $(OBJS)/helpfiles + +$(OBJS)\help.exe: $(OBJS)\help_help.obj $(OBJS)\help_help.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\help_help.obj,$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\help_help.res +| diff --git a/samples/html/help/makefile.gcc b/samples/html/help/makefile.gcc new file mode 100644 index 0000000000..80fd3e93b0 --- /dev/null +++ b/samples/html/help/makefile.gcc @@ -0,0 +1,116 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +HELP_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p_1 = --define __WXDEBUG__ +endif +ifeq ($(SHARED),1) +__DLLFLAG_p = -DWXUSINGDLL +endif +ifeq ($(SHARED),1) +__DLLFLAG_p_1 = --define WXUSINGDLL +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_HTML_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\help.exe data + +$(OBJS)\help_help.o: .\help.cpp + $(CXX) -c -o $@ $(HELP_CXXFLAGS) $< + +$(OBJS)\help_help_rc.o: .\help.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir ./../../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib --include-dir ./../../../src/regex --include-dir . $(__DLLFLAG_p_1) + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist $(OBJS)\help.exe del $(OBJS)\help.exe + +data: + if not exist $(OBJS)/helpfiles mkdir $(OBJS)/helpfiles + for %%f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)/helpfiles\%%f copy ./helpfiles\%%f $(OBJS)/helpfiles + +$(OBJS)\help.exe: $(OBJS)\help_help.o $(OBJS)\help_help_rc.o + $(CXX) -o $@ $(OBJS)\help_help.o $(OBJS)\help_help_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + +.PHONY: all clean diff --git a/samples/html/help/makefile.vc b/samples/html/help/makefile.vc new file mode 100644 index 0000000000..16f51742b6 --- /dev/null +++ b/samples/html/help/makefile.vc @@ -0,0 +1,132 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +HELP_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\help.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = /d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\help.exe data + +$(OBJS)\help_help.obj: .\help.cpp + $(CXX) /c /nologo /TP /Fo$@ $(HELP_CXXFLAGS) $** + +$(OBJS)\help_help.res: .\help.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\..\include /i.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\..\src\tiff /i.\..\..\..\src\jpeg /i.\..\..\..\src\png /i.\..\..\..\src\zlib /i.\..\..\..\src\regex /i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\help.exe del $(OBJS)\help.exe + +data: + if not exist $(OBJS)/helpfiles mkdir $(OBJS)/helpfiles + for %f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)/helpfiles\%f copy ./helpfiles\%f $(OBJS)/helpfiles + +$(OBJS)\help.exe: $(OBJS)\help_help.obj $(OBJS)\help_help.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\help_help.obj $(OBJS)\help_help.res $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 819ece5424..f81af05e5a 100644 --- a/samples/html/help/makefile.wat +++ b/samples/html/help/makefile.wat @@ -1,12 +1,155 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = help -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +HELP_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\help.exe data + +$(OBJS)\help_help.obj : .AUTODEPEND .\help.cpp + $(CXX) -zq -fo=$^@ $(HELP_CXXFLAGS) $< + +$(OBJS)\help_help.res : .AUTODEPEND .\help.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\help.exe del $(OBJS)\help.exe + +data : + if not exist $(OBJS)/helpfiles mkdir $(OBJS)/helpfiles + for %f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)/helpfiles\%f copy ./helpfiles\%f $(OBJS)/helpfiles + +$(OBJS)\help.exe : $(OBJS)\help_help.obj $(OBJS)\help_help.res + @%create $(OBJS)\help.lbc + @%append $(OBJS)\help.lbc option quiet + @%append $(OBJS)\help.lbc name $^@ + @%append $(OBJS)\help.lbc option incremental + @%append $(OBJS)\help.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\help_help.obj) do @%append $(OBJS)\help.lbc file %i + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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_help.res + wlink @$(OBJS)\help.lbc diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in index 5827acbcfe..af82a4fec5 100644 --- a/samples/html/helpview/Makefile.in +++ b/samples/html/helpview/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -HELPVIEW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +HELPVIEW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,38 +52,61 @@ HELPVIEW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o helpview$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_0@__WXLIB_HTML_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o helpview$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_HTML_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__helpview___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__helpview___mac_setfilecmd = $(SETFILE) -a C helpview$(EXEEXT) +@COND_PLATFORM_MAC_1@__helpview___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C helpview$(EXEEXT) @COND_PLATFORM_WIN32_1@__helpview___win32rc = helpview_helpview_rc.o ### Targets: ### @@ -103,7 +131,7 @@ distclean: clean rm -f bk-deps shared-ld-sh helpview$(EXEEXT): helpview_helpview.o $(__helpview___win32rc) - $(CXX) -o $@ helpview_helpview.o $(__helpview___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ helpview_helpview.o $(__helpview___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__helpview___mac_rezcmd) $(__helpview___mac_setfilecmd) diff --git a/samples/html/helpview/makefile.bcc b/samples/html/helpview/makefile.bcc new file mode 100644 index 0000000000..e470196e1f --- /dev/null +++ b/samples/html/helpview/makefile.bcc @@ -0,0 +1,143 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +HELPVIEW_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ + -I.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ + -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\helpview.exe data + +$(OBJS)\helpview_helpview.obj: .\helpview.cpp + $(CXX) -q -c -P -o$@ $(HELPVIEW_CXXFLAGS) $** + +$(OBJS)\helpview_helpview.res: .\helpview.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib -i.\..\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\helpview.exe: $(OBJS)\helpview_helpview.obj $(OBJS)\helpview_helpview.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\helpview_helpview.obj,$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\helpview_helpview.res +| diff --git a/samples/html/helpview/makefile.gcc b/samples/html/helpview/makefile.gcc new file mode 100644 index 0000000000..82d87d73ec --- /dev/null +++ b/samples/html/helpview/makefile.gcc @@ -0,0 +1,116 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +HELPVIEW_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p_1 = --define __WXDEBUG__ +endif +ifeq ($(SHARED),1) +__DLLFLAG_p = -DWXUSINGDLL +endif +ifeq ($(SHARED),1) +__DLLFLAG_p_1 = --define WXUSINGDLL +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_HTML_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\helpview.exe data + +$(OBJS)\helpview_helpview.o: .\helpview.cpp + $(CXX) -c -o $@ $(HELPVIEW_CXXFLAGS) $< + +$(OBJS)\helpview_helpview_rc.o: .\helpview.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir ./../../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib --include-dir ./../../../src/regex --include-dir . $(__DLLFLAG_p_1) + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %%f in (test.zip) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) + +$(OBJS)\helpview.exe: $(OBJS)\helpview_helpview.o $(OBJS)\helpview_helpview_rc.o + $(CXX) -o $@ $(OBJS)\helpview_helpview.o $(OBJS)\helpview_helpview_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + +.PHONY: all clean diff --git a/samples/html/helpview/makefile.vc b/samples/html/helpview/makefile.vc new file mode 100644 index 0000000000..5938a90f8c --- /dev/null +++ b/samples/html/helpview/makefile.vc @@ -0,0 +1,132 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +HELPVIEW_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\helpview.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = /d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\helpview.exe data + +$(OBJS)\helpview_helpview.obj: .\helpview.cpp + $(CXX) /c /nologo /TP /Fo$@ $(HELPVIEW_CXXFLAGS) $** + +$(OBJS)\helpview_helpview.res: .\helpview.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\..\include /i.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\..\src\tiff /i.\..\..\..\src\jpeg /i.\..\..\..\src\png /i.\..\..\..\src\zlib /i.\..\..\..\src\regex /i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\helpview.exe: $(OBJS)\helpview_helpview.obj $(OBJS)\helpview_helpview.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\helpview_helpview.obj $(OBJS)\helpview_helpview.res $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 48e3433b19..040554f88e 100644 --- a/samples/html/helpview/makefile.wat +++ b/samples/html/helpview/makefile.wat @@ -1,12 +1,155 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = helpview -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +HELPVIEW_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\helpview.exe data + +$(OBJS)\helpview_helpview.obj : .AUTODEPEND .\helpview.cpp + $(CXX) -zq -fo=$^@ $(HELPVIEW_CXXFLAGS) $< + +$(OBJS)\helpview_helpview.res : .AUTODEPEND .\helpview.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe + +data : + if not exist $(OBJS) mkdir $(OBJS) + for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\helpview.exe : $(OBJS)\helpview_helpview.obj $(OBJS)\helpview_helpview.res + @%create $(OBJS)\helpview.lbc + @%append $(OBJS)\helpview.lbc option quiet + @%append $(OBJS)\helpview.lbc name $^@ + @%append $(OBJS)\helpview.lbc option incremental + @%append $(OBJS)\helpview.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\helpview_helpview.obj) do @%append $(OBJS)\helpview.lbc file %i + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\helpview.lbc diff --git a/samples/html/makefile.bcc b/samples/html/makefile.bcc new file mode 100644 index 0000000000..18183f386a --- /dev/null +++ b/samples/html/makefile.bcc @@ -0,0 +1,58 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + + +### Conditionally set variables: ### + + + +### Targets: ### + +all: about help helpview printing test virtual widget zip + +about: + (cd about && $(MAKE) all) + +clean: + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + +help: + (cd help && $(MAKE) all) + +helpview: + (cd helpview && $(MAKE) all) + +printing: + (cd printing && $(MAKE) all) + +test: + (cd test && $(MAKE) all) + +virtual: + (cd virtual && $(MAKE) all) + +widget: + (cd widget && $(MAKE) all) + +zip: + (cd zip && $(MAKE) all) diff --git a/samples/html/makefile.gcc b/samples/html/makefile.gcc new file mode 100644 index 0000000000..9a6e381571 --- /dev/null +++ b/samples/html/makefile.gcc @@ -0,0 +1,51 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + + +### Conditionally set variables: ### + + + +### Targets: ### + +all: about help helpview printing test virtual widget zip + +about: + (cd about && $(MAKE) all) + +clean: + -if exist .\*.o del .\*.o + +help: + (cd help && $(MAKE) all) + +helpview: + (cd helpview && $(MAKE) all) + +printing: + (cd printing && $(MAKE) all) + +test: + (cd test && $(MAKE) all) + +virtual: + (cd virtual && $(MAKE) all) + +widget: + (cd widget && $(MAKE) all) + +zip: + (cd zip && $(MAKE) all) + +.PHONY: all about clean help helpview printing test virtual widget zip diff --git a/samples/html/makefile.vc b/samples/html/makefile.vc new file mode 100644 index 0000000000..2c32d11eb7 --- /dev/null +++ b/samples/html/makefile.vc @@ -0,0 +1,66 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + + +### Conditionally set variables: ### + + + +### Targets: ### + +all: about help helpview printing test virtual widget zip + +about: + cd about + $(MAKE) /$(MAKEFLAGS) all + cd $(MAKEDIR) + +clean: + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + +help: + cd help + $(MAKE) /$(MAKEFLAGS) all + cd $(MAKEDIR) + +helpview: + cd helpview + $(MAKE) /$(MAKEFLAGS) all + cd $(MAKEDIR) + +printing: + cd printing + $(MAKE) /$(MAKEFLAGS) all + cd $(MAKEDIR) + +test: + cd test + $(MAKE) /$(MAKEFLAGS) all + cd $(MAKEDIR) + +virtual: + cd virtual + $(MAKE) /$(MAKEFLAGS) all + cd $(MAKEDIR) + +widget: + cd widget + $(MAKE) /$(MAKEFLAGS) all + cd $(MAKEDIR) + +zip: + cd zip + $(MAKE) /$(MAKEFLAGS) all + cd $(MAKEDIR) diff --git a/samples/html/makefile.wat b/samples/html/makefile.wat index f152f07330..d4243f5530 100644 --- a/samples/html/makefile.wat +++ b/samples/html/makefile.wat @@ -1,56 +1,84 @@ -# -# File: makefile.wat -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds samples for windows with Watcom -# Use FINAL=1 argument to wmake to build final version with no debugging -# info - -# Set WXDIR for your system -WXDIR = $(%WXWIN) - -THISDIR=$(WXDIR)\samples\html - -!include $(WXDIR)\src\makewat.env - -all: - cd $(WXDIR)\samples\html\about - wmake -f makefile.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) - cd $(WXDIR)\samples\html\help - wmake -f makefile.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) - cd $(WXDIR)\samples\html\helpview - wmake -f makefile.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) - cd $(WXDIR)\samples\html\printing - wmake -f makefile.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) - cd $(WXDIR)\samples\html\test - wmake -f makefile.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) - cd $(WXDIR)\samples\html\virtual - wmake -f makefile.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) - cd $(WXDIR)\samples\html\widget - wmake -f makefile.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) - cd $(WXDIR)\samples\html\zip - wmake -f makefile.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) - -clean: - cd $(WXDIR)\samples\html\about - wmake -f makefile.wat clean - cd $(WXDIR)\samples\html\help - wmake -f makefile.wat clean - cd $(WXDIR)\samples\html\helpview - wmake -f makefile.wat clean - cd $(WXDIR)\samples\html\printing - wmake -f makefile.wat clean - cd $(WXDIR)\samples\html\test - wmake -f makefile.wat clean - cd $(WXDIR)\samples\html\virtual - wmake -f makefile.wat clean - cd $(WXDIR)\samples\html\widget - wmake -f makefile.wat clean - cd $(WXDIR)\samples\html\zip - wmake -f makefile.wat clean +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + + +### Variables: ### + + + + +### Targets: ### + +all : .SYMBOLIC about help helpview printing test virtual widget zip + +about : .SYMBOLIC + cd about + wmake $(__MAKEOPTS__) all + cd $(WATCOM_CWD) + +clean : .SYMBOLIC + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + -if exist .\*.lbc del .\*.lbc + -if exist .\*.ilk del .\*.ilk + +help : .SYMBOLIC + cd help + wmake $(__MAKEOPTS__) all + cd $(WATCOM_CWD) + +helpview : .SYMBOLIC + cd helpview + wmake $(__MAKEOPTS__) all + cd $(WATCOM_CWD) + +printing : .SYMBOLIC + cd printing + wmake $(__MAKEOPTS__) all + cd $(WATCOM_CWD) + +test : .SYMBOLIC + cd test + wmake $(__MAKEOPTS__) all + cd $(WATCOM_CWD) + +virtual : .SYMBOLIC + cd virtual + wmake $(__MAKEOPTS__) all + cd $(WATCOM_CWD) + +widget : .SYMBOLIC + cd widget + wmake $(__MAKEOPTS__) all + cd $(WATCOM_CWD) + +zip : .SYMBOLIC + cd zip + wmake $(__MAKEOPTS__) all + cd $(WATCOM_CWD) diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in index 0ea7ce58cc..3aad98b63e 100644 --- a/samples/html/printing/Makefile.in +++ b/samples/html/printing/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -PRINTING_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +PRINTING_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,38 +52,61 @@ PRINTING_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o printing$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_0@__WXLIB_HTML_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o printing$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_HTML_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__printing___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__printing___mac_setfilecmd = $(SETFILE) -a C printing$(EXEEXT) +@COND_PLATFORM_MAC_1@__printing___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C printing$(EXEEXT) @COND_PLATFORM_WIN32_1@__printing___win32rc = printing_printing_rc.o ### Targets: ### @@ -107,7 +135,7 @@ install: all install-strip: install printing$(EXEEXT): printing_printing.o $(__printing___win32rc) - $(CXX) -o $@ printing_printing.o $(__printing___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ printing_printing.o $(__printing___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__printing___mac_rezcmd) $(__printing___mac_setfilecmd) diff --git a/samples/html/printing/makefile.bcc b/samples/html/printing/makefile.bcc new file mode 100644 index 0000000000..2661e8fef5 --- /dev/null +++ b/samples/html/printing/makefile.bcc @@ -0,0 +1,143 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +PRINTING_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ + -I.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ + -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\printing.exe data + +$(OBJS)\printing_printing.obj: .\printing.cpp + $(CXX) -q -c -P -o$@ $(PRINTING_CXXFLAGS) $** + +$(OBJS)\printing_printing.res: .\printing.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib -i.\..\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\printing.exe: $(OBJS)\printing_printing.obj $(OBJS)\printing_printing.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\printing_printing.obj,$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\printing_printing.res +| diff --git a/samples/html/printing/makefile.gcc b/samples/html/printing/makefile.gcc new file mode 100644 index 0000000000..63ab3cecaa --- /dev/null +++ b/samples/html/printing/makefile.gcc @@ -0,0 +1,116 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +PRINTING_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p_1 = --define __WXDEBUG__ +endif +ifeq ($(SHARED),1) +__DLLFLAG_p = -DWXUSINGDLL +endif +ifeq ($(SHARED),1) +__DLLFLAG_p_1 = --define WXUSINGDLL +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_HTML_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\printing.exe data + +$(OBJS)\printing_printing.o: .\printing.cpp + $(CXX) -c -o $@ $(PRINTING_CXXFLAGS) $< + +$(OBJS)\printing_printing_rc.o: .\printing.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir ./../../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib --include-dir ./../../../src/regex --include-dir . $(__DLLFLAG_p_1) + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %%f in (logo6.gif test.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) + +$(OBJS)\printing.exe: $(OBJS)\printing_printing.o $(OBJS)\printing_printing_rc.o + $(CXX) -o $@ $(OBJS)\printing_printing.o $(OBJS)\printing_printing_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + +.PHONY: all clean diff --git a/samples/html/printing/makefile.vc b/samples/html/printing/makefile.vc new file mode 100644 index 0000000000..21dc5be868 --- /dev/null +++ b/samples/html/printing/makefile.vc @@ -0,0 +1,132 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +PRINTING_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\printing.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = /d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\printing.exe data + +$(OBJS)\printing_printing.obj: .\printing.cpp + $(CXX) /c /nologo /TP /Fo$@ $(PRINTING_CXXFLAGS) $** + +$(OBJS)\printing_printing.res: .\printing.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\..\include /i.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\..\src\tiff /i.\..\..\..\src\jpeg /i.\..\..\..\src\png /i.\..\..\..\src\zlib /i.\..\..\..\src\regex /i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\printing.exe: $(OBJS)\printing_printing.obj $(OBJS)\printing_printing.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\printing_printing.obj $(OBJS)\printing_printing.res $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 f1d9dfa721..912a005928 100644 --- a/samples/html/printing/makefile.wat +++ b/samples/html/printing/makefile.wat @@ -1,12 +1,155 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = printing -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +PRINTING_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\printing.exe data + +$(OBJS)\printing_printing.obj : .AUTODEPEND .\printing.cpp + $(CXX) -zq -fo=$^@ $(PRINTING_CXXFLAGS) $< + +$(OBJS)\printing_printing.res : .AUTODEPEND .\printing.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe + +data : + if not exist $(OBJS) mkdir $(OBJS) + for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\printing.exe : $(OBJS)\printing_printing.obj $(OBJS)\printing_printing.res + @%create $(OBJS)\printing.lbc + @%append $(OBJS)\printing.lbc option quiet + @%append $(OBJS)\printing.lbc name $^@ + @%append $(OBJS)\printing.lbc option incremental + @%append $(OBJS)\printing.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\printing_printing.obj) do @%append $(OBJS)\printing.lbc file %i + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\printing.lbc diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in index 5274a50147..e59511e859 100644 --- a/samples/html/test/Makefile.in +++ b/samples/html/test/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -TEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +TEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,38 +52,61 @@ TEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_ @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o test$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_0@__WXLIB_HTML_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o test$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_HTML_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__test___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__test___mac_setfilecmd = $(SETFILE) -a C test$(EXEEXT) +@COND_PLATFORM_MAC_1@__test___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C test$(EXEEXT) @COND_PLATFORM_WIN32_1@__test___win32rc = test_test_rc.o ### Targets: ### @@ -107,7 +135,7 @@ install: all install-strip: install test$(EXEEXT): test_test.o $(__test___win32rc) - $(CXX) -o $@ test_test.o $(__test___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ test_test.o $(__test___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__test___mac_rezcmd) $(__test___mac_setfilecmd) diff --git a/samples/html/test/makefile.bcc b/samples/html/test/makefile.bcc new file mode 100644 index 0000000000..744ff40790 --- /dev/null +++ b/samples/html/test/makefile.bcc @@ -0,0 +1,143 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +TEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ + -I.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ + -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\test.exe data + +$(OBJS)\test_test.obj: .\test.cpp + $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** + +$(OBJS)\test_test.res: .\test.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib -i.\..\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\test.exe del $(OBJS)\test.exe + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm i18n.gif 8859_2.htm cp1250.htm regres.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\test.exe: $(OBJS)\test_test.obj $(OBJS)\test_test.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\test_test.obj,$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\test_test.res +| diff --git a/samples/html/test/makefile.gcc b/samples/html/test/makefile.gcc new file mode 100644 index 0000000000..399e0e5c4f --- /dev/null +++ b/samples/html/test/makefile.gcc @@ -0,0 +1,116 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +TEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p_1 = --define __WXDEBUG__ +endif +ifeq ($(SHARED),1) +__DLLFLAG_p = -DWXUSINGDLL +endif +ifeq ($(SHARED),1) +__DLLFLAG_p_1 = --define WXUSINGDLL +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_HTML_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\test.exe data + +$(OBJS)\test_test.o: .\test.cpp + $(CXX) -c -o $@ $(TEST_CXXFLAGS) $< + +$(OBJS)\test_test_rc.o: .\test.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir ./../../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib --include-dir ./../../../src/regex --include-dir . $(__DLLFLAG_p_1) + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist $(OBJS)\test.exe del $(OBJS)\test.exe + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %%f in (f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm i18n.gif 8859_2.htm cp1250.htm regres.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) + +$(OBJS)\test.exe: $(OBJS)\test_test.o $(OBJS)\test_test_rc.o + $(CXX) -o $@ $(OBJS)\test_test.o $(OBJS)\test_test_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + +.PHONY: all clean diff --git a/samples/html/test/makefile.vc b/samples/html/test/makefile.vc new file mode 100644 index 0000000000..74c45face5 --- /dev/null +++ b/samples/html/test/makefile.vc @@ -0,0 +1,132 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +TEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\test.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = /d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\test.exe data + +$(OBJS)\test_test.obj: .\test.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** + +$(OBJS)\test_test.res: .\test.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\..\include /i.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\..\src\tiff /i.\..\..\..\src\jpeg /i.\..\..\..\src\png /i.\..\..\..\src\zlib /i.\..\..\..\src\regex /i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\test.exe del $(OBJS)\test.exe + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm i18n.gif 8859_2.htm cp1250.htm regres.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\test.exe: $(OBJS)\test_test.obj $(OBJS)\test_test.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\test_test.obj $(OBJS)\test_test.res $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 cb1a911ba7..af02fd0426 100644 --- a/samples/html/test/makefile.wat +++ b/samples/html/test/makefile.wat @@ -1,12 +1,155 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = test -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +TEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\test.exe data + +$(OBJS)\test_test.obj : .AUTODEPEND .\test.cpp + $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $< + +$(OBJS)\test_test.res : .AUTODEPEND .\test.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\test.exe del $(OBJS)\test.exe + +data : + if not exist $(OBJS) mkdir $(OBJS) + for %f in (f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm i18n.gif 8859_2.htm cp1250.htm regres.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\test.exe : $(OBJS)\test_test.obj $(OBJS)\test_test.res + @%create $(OBJS)\test.lbc + @%append $(OBJS)\test.lbc option quiet + @%append $(OBJS)\test.lbc name $^@ + @%append $(OBJS)\test.lbc option incremental + @%append $(OBJS)\test.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\test_test.obj) do @%append $(OBJS)\test.lbc file %i + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\test.lbc diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in index fa5d98489f..1ec7e3fdde 100644 --- a/samples/html/virtual/Makefile.in +++ b/samples/html/virtual/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -VIRTUAL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +VIRTUAL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,38 +52,61 @@ VIRTUAL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o virtual$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_0@__WXLIB_HTML_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o virtual$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_HTML_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__virtual___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__virtual___mac_setfilecmd = $(SETFILE) -a C virtual$(EXEEXT) +@COND_PLATFORM_MAC_1@__virtual___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C virtual$(EXEEXT) @COND_PLATFORM_WIN32_1@__virtual___win32rc = virtual_virtual_rc.o ### Targets: ### @@ -109,7 +137,7 @@ install-strip: install uninstall: virtual$(EXEEXT): virtual_virtual.o $(__virtual___win32rc) - $(CXX) -o $@ virtual_virtual.o $(__virtual___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ virtual_virtual.o $(__virtual___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__virtual___mac_rezcmd) $(__virtual___mac_setfilecmd) diff --git a/samples/html/virtual/makefile.bcc b/samples/html/virtual/makefile.bcc new file mode 100644 index 0000000000..6e9862839a --- /dev/null +++ b/samples/html/virtual/makefile.bcc @@ -0,0 +1,143 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +VIRTUAL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ + -I.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ + -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\virtual.exe data + +$(OBJS)\virtual_virtual.obj: .\virtual.cpp + $(CXX) -q -c -P -o$@ $(VIRTUAL_CXXFLAGS) $** + +$(OBJS)\virtual_virtual.res: .\virtual.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib -i.\..\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\virtual.exe: $(OBJS)\virtual_virtual.obj $(OBJS)\virtual_virtual.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\virtual_virtual.obj,$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\virtual_virtual.res +| diff --git a/samples/html/virtual/makefile.gcc b/samples/html/virtual/makefile.gcc new file mode 100644 index 0000000000..4f712d02ab --- /dev/null +++ b/samples/html/virtual/makefile.gcc @@ -0,0 +1,116 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +VIRTUAL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p_1 = --define __WXDEBUG__ +endif +ifeq ($(SHARED),1) +__DLLFLAG_p = -DWXUSINGDLL +endif +ifeq ($(SHARED),1) +__DLLFLAG_p_1 = --define WXUSINGDLL +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_HTML_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\virtual.exe data + +$(OBJS)\virtual_virtual.o: .\virtual.cpp + $(CXX) -c -o $@ $(VIRTUAL_CXXFLAGS) $< + +$(OBJS)\virtual_virtual_rc.o: .\virtual.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir ./../../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib --include-dir ./../../../src/regex --include-dir . $(__DLLFLAG_p_1) + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %%f in (start.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) + +$(OBJS)\virtual.exe: $(OBJS)\virtual_virtual.o $(OBJS)\virtual_virtual_rc.o + $(CXX) -o $@ $(OBJS)\virtual_virtual.o $(OBJS)\virtual_virtual_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + +.PHONY: all clean diff --git a/samples/html/virtual/makefile.vc b/samples/html/virtual/makefile.vc new file mode 100644 index 0000000000..790a07f0db --- /dev/null +++ b/samples/html/virtual/makefile.vc @@ -0,0 +1,132 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +VIRTUAL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\virtual.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = /d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\virtual.exe data + +$(OBJS)\virtual_virtual.obj: .\virtual.cpp + $(CXX) /c /nologo /TP /Fo$@ $(VIRTUAL_CXXFLAGS) $** + +$(OBJS)\virtual_virtual.res: .\virtual.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\..\include /i.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\..\src\tiff /i.\..\..\..\src\jpeg /i.\..\..\..\src\png /i.\..\..\..\src\zlib /i.\..\..\..\src\regex /i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\virtual.exe: $(OBJS)\virtual_virtual.obj $(OBJS)\virtual_virtual.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\virtual_virtual.obj $(OBJS)\virtual_virtual.res $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 085e5a1daf..42a086d1de 100644 --- a/samples/html/virtual/makefile.wat +++ b/samples/html/virtual/makefile.wat @@ -1,12 +1,155 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = virtual -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +VIRTUAL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\virtual.exe data + +$(OBJS)\virtual_virtual.obj : .AUTODEPEND .\virtual.cpp + $(CXX) -zq -fo=$^@ $(VIRTUAL_CXXFLAGS) $< + +$(OBJS)\virtual_virtual.res : .AUTODEPEND .\virtual.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe + +data : + if not exist $(OBJS) mkdir $(OBJS) + for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\virtual.exe : $(OBJS)\virtual_virtual.obj $(OBJS)\virtual_virtual.res + @%create $(OBJS)\virtual.lbc + @%append $(OBJS)\virtual.lbc option quiet + @%append $(OBJS)\virtual.lbc name $^@ + @%append $(OBJS)\virtual.lbc option incremental + @%append $(OBJS)\virtual.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\virtual_virtual.obj) do @%append $(OBJS)\virtual.lbc file %i + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\virtual.lbc diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in index ec4f01a936..df645c1533 100644 --- a/samples/html/widget/Makefile.in +++ b/samples/html/widget/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -WIDGET_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +WIDGET_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,38 +52,61 @@ WIDGET_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(to @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o widget$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_0@__WXLIB_HTML_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o widget$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_HTML_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__widget___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__widget___mac_setfilecmd = $(SETFILE) -a C widget$(EXEEXT) +@COND_PLATFORM_MAC_1@__widget___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C widget$(EXEEXT) @COND_PLATFORM_WIN32_1@__widget___win32rc = widget_widget_rc.o ### Targets: ### @@ -109,7 +137,7 @@ install-strip: install uninstall: widget$(EXEEXT): widget_widget.o $(__widget___win32rc) - $(CXX) -o $@ widget_widget.o $(__widget___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ widget_widget.o $(__widget___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__widget___mac_rezcmd) $(__widget___mac_setfilecmd) diff --git a/samples/html/widget/makefile.bcc b/samples/html/widget/makefile.bcc new file mode 100644 index 0000000000..fe3e2b16d0 --- /dev/null +++ b/samples/html/widget/makefile.bcc @@ -0,0 +1,143 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +WIDGET_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ + -I.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ + -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\widget.exe data + +$(OBJS)\widget_widget.obj: .\widget.cpp + $(CXX) -q -c -P -o$@ $(WIDGET_CXXFLAGS) $** + +$(OBJS)\widget_widget.res: .\widget.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib -i.\..\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\widget.exe: $(OBJS)\widget_widget.obj $(OBJS)\widget_widget.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\widget_widget.obj,$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\widget_widget.res +| diff --git a/samples/html/widget/makefile.gcc b/samples/html/widget/makefile.gcc new file mode 100644 index 0000000000..dff2cff91b --- /dev/null +++ b/samples/html/widget/makefile.gcc @@ -0,0 +1,116 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +WIDGET_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p_1 = --define __WXDEBUG__ +endif +ifeq ($(SHARED),1) +__DLLFLAG_p = -DWXUSINGDLL +endif +ifeq ($(SHARED),1) +__DLLFLAG_p_1 = --define WXUSINGDLL +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_HTML_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\widget.exe data + +$(OBJS)\widget_widget.o: .\widget.cpp + $(CXX) -c -o $@ $(WIDGET_CXXFLAGS) $< + +$(OBJS)\widget_widget_rc.o: .\widget.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir ./../../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib --include-dir ./../../../src/regex --include-dir . $(__DLLFLAG_p_1) + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %%f in (start.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) + +$(OBJS)\widget.exe: $(OBJS)\widget_widget.o $(OBJS)\widget_widget_rc.o + $(CXX) -o $@ $(OBJS)\widget_widget.o $(OBJS)\widget_widget_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + +.PHONY: all clean diff --git a/samples/html/widget/makefile.vc b/samples/html/widget/makefile.vc new file mode 100644 index 0000000000..c6d748144f --- /dev/null +++ b/samples/html/widget/makefile.vc @@ -0,0 +1,132 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +WIDGET_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\widget.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = /d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\widget.exe data + +$(OBJS)\widget_widget.obj: .\widget.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGET_CXXFLAGS) $** + +$(OBJS)\widget_widget.res: .\widget.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\..\include /i.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\..\src\tiff /i.\..\..\..\src\jpeg /i.\..\..\..\src\png /i.\..\..\..\src\zlib /i.\..\..\..\src\regex /i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\widget.exe: $(OBJS)\widget_widget.obj $(OBJS)\widget_widget.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\widget_widget.obj $(OBJS)\widget_widget.res $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 c5cb16d225..4e83352946 100644 --- a/samples/html/widget/makefile.wat +++ b/samples/html/widget/makefile.wat @@ -1,12 +1,155 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = widget -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +WIDGET_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\widget.exe data + +$(OBJS)\widget_widget.obj : .AUTODEPEND .\widget.cpp + $(CXX) -zq -fo=$^@ $(WIDGET_CXXFLAGS) $< + +$(OBJS)\widget_widget.res : .AUTODEPEND .\widget.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe + +data : + if not exist $(OBJS) mkdir $(OBJS) + for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\widget.exe : $(OBJS)\widget_widget.obj $(OBJS)\widget_widget.res + @%create $(OBJS)\widget.lbc + @%append $(OBJS)\widget.lbc option quiet + @%append $(OBJS)\widget.lbc name $^@ + @%append $(OBJS)\widget.lbc option incremental + @%append $(OBJS)\widget.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\widget_widget.obj) do @%append $(OBJS)\widget.lbc file %i + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\widget.lbc diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in index c0c9a447f3..431cc75065 100644 --- a/samples/html/zip/Makefile.in +++ b/samples/html/zip/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -ZIP_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +ZIP_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,33 +52,55 @@ ZIP_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_s @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o zip$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_0@__WXLIB_HTML_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o zip$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_HTML_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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__ @@ -109,7 +136,7 @@ install-strip: install uninstall: zip$(EXEEXT): zip_zip.o $(__zip___win32rc) - $(CXX) -o $@ zip_zip.o $(__zip___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ zip_zip.o $(__zip___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__zip___mac_rezcmd) $(__zip___mac_setfilecmd) diff --git a/samples/html/zip/makefile.bcc b/samples/html/zip/makefile.bcc new file mode 100644 index 0000000000..17fbed0b23 --- /dev/null +++ b/samples/html/zip/makefile.bcc @@ -0,0 +1,143 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +ZIP_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ + -I.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ + -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\zip.exe data + +$(OBJS)\zip_zip.obj: .\zip.cpp + $(CXX) -q -c -P -o$@ $(ZIP_CXXFLAGS) $** + +$(OBJS)\zip_zip.res: .\zip.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib -i.\..\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\zip.exe: $(OBJS)\zip_zip.obj $(OBJS)\zip_zip.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\zip_zip.obj,$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\zip_zip.res +| diff --git a/samples/html/zip/makefile.gcc b/samples/html/zip/makefile.gcc new file mode 100644 index 0000000000..eebcc00425 --- /dev/null +++ b/samples/html/zip/makefile.gcc @@ -0,0 +1,116 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +ZIP_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p_1 = --define __WXDEBUG__ +endif +ifeq ($(SHARED),1) +__DLLFLAG_p = -DWXUSINGDLL +endif +ifeq ($(SHARED),1) +__DLLFLAG_p_1 = --define WXUSINGDLL +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_HTML_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\zip.exe data + +$(OBJS)\zip_zip.o: .\zip.cpp + $(CXX) -c -o $@ $(ZIP_CXXFLAGS) $< + +$(OBJS)\zip_zip_rc.o: .\zip.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir ./../../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib --include-dir ./../../../src/regex --include-dir . $(__DLLFLAG_p_1) + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %%f in (pages.zip start.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) + +$(OBJS)\zip.exe: $(OBJS)\zip_zip.o $(OBJS)\zip_zip_rc.o + $(CXX) -o $@ $(OBJS)\zip_zip.o $(OBJS)\zip_zip_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + +.PHONY: all clean diff --git a/samples/html/zip/makefile.vc b/samples/html/zip/makefile.vc new file mode 100644 index 0000000000..f2d29b0aee --- /dev/null +++ b/samples/html/zip/makefile.vc @@ -0,0 +1,132 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +ZIP_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\zip.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = /d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\zip.exe data + +$(OBJS)\zip_zip.obj: .\zip.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ZIP_CXXFLAGS) $** + +$(OBJS)\zip_zip.res: .\zip.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\..\include /i.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\..\src\tiff /i.\..\..\..\src\jpeg /i.\..\..\..\src\png /i.\..\..\..\src\zlib /i.\..\..\..\src\regex /i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\zip.exe: $(OBJS)\zip_zip.obj $(OBJS)\zip_zip.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\zip_zip.obj $(OBJS)\zip_zip.res $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 d71db45fa6..1e115e864c 100644 --- a/samples/html/zip/makefile.wat +++ b/samples/html/zip/makefile.wat @@ -1,12 +1,155 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = zip -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +ZIP_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\zip.exe data + +$(OBJS)\zip_zip.obj : .AUTODEPEND .\zip.cpp + $(CXX) -zq -fo=$^@ $(ZIP_CXXFLAGS) $< + +$(OBJS)\zip_zip.res : .AUTODEPEND .\zip.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe + +data : + if not exist $(OBJS) mkdir $(OBJS) + for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\zip.exe : $(OBJS)\zip_zip.obj $(OBJS)\zip_zip.res + @%create $(OBJS)\zip.lbc + @%append $(OBJS)\zip.lbc option quiet + @%append $(OBJS)\zip.lbc name $^@ + @%append $(OBJS)\zip.lbc option incremental + @%append $(OBJS)\zip.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\zip_zip.obj) do @%append $(OBJS)\zip.lbc file %i + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\zip.lbc diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in index eeab500436..beab761f2c 100644 --- a/samples/image/Makefile.in +++ b/samples/image/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -IMAGE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +IMAGE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ IMAGE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o image$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o image$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__image___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__image___mac_setfilecmd = $(SETFILE) -a C image$(EXEEXT) +@COND_PLATFORM_MAC_1@__image___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C image$(EXEEXT) @COND_PLATFORM_WIN32_1@__image___win32rc = image_image_rc.o ### Targets: ### @@ -102,7 +129,7 @@ distclean: clean rm -f bk-deps shared-ld-sh image$(EXEEXT): image_image.o $(__image___win32rc) - $(CXX) -o $@ image_image.o $(__image___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ image_image.o $(__image___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__image___mac_rezcmd) $(__image___mac_setfilecmd) diff --git a/samples/image/makefile.bcc b/samples/image/makefile.bcc index 1e79b3356a..bec17b8776 100644 --- a/samples/image/makefile.bcc +++ b/samples/image/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -IMAGE_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +IMAGE_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,23 +122,18 @@ $(OBJS)\image_image.obj: .\image.cpp $(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) $** $(OBJS)\image_image.res: .\image.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\image.exe del $(OBJS)\image.exe - -if exist $(OBJS)\horse.png $(OBJS)\horse.jpg $(OBJS)\horse.bmp $(OBJS)\horse.gif $(OBJS)\horse.pcx $(OBJS)\horse.pnm $(OBJS)\horse.tif $(OBJS)\horse.xpm $(OBJS)\horse.cur $(OBJS)\horse.ico $(OBJS)\horse3.ani $(OBJS)\smile.xbm del $(OBJS)\horse.png $(OBJS)\horse.jpg $(OBJS)\horse.bmp $(OBJS)\horse.gif $(OBJS)\horse.pcx $(OBJS)\horse.pnm $(OBJS)\horse.tif $(OBJS)\horse.xpm $(OBJS)\horse.cur $(OBJS)\horse.ico $(OBJS)\horse3.ani $(OBJS)\smile.xbm data: if not exist $(OBJS) mkdir $(OBJS) for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse.tif horse.xpm horse.cur horse.ico horse3.ani smile.xbm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\image.exe: $(OBJS)\image_image.obj $(OBJS)\image_image.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\image_image.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\image_image.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\image_image.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\image_image.res | - -install: all - -uninstall: diff --git a/samples/image/makefile.gcc b/samples/image/makefile.gcc index 764f26834f..005d380913 100644 --- a/samples/image/makefile.gcc +++ b/samples/image/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +IMAGE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -IMAGE_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -122,17 +102,12 @@ $(OBJS)\image_image_rc.o: .\image.rc clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\image.exe del $(OBJS)\image.exe - -if exist $(OBJS)\horse.png $(OBJS)\horse.jpg $(OBJS)\horse.bmp $(OBJS)\horse.gif $(OBJS)\horse.pcx $(OBJS)\horse.pnm $(OBJS)\horse.tif $(OBJS)\horse.xpm $(OBJS)\horse.cur $(OBJS)\horse.ico $(OBJS)\horse3.ani $(OBJS)\smile.xbm del $(OBJS)\horse.png $(OBJS)\horse.jpg $(OBJS)\horse.bmp $(OBJS)\horse.gif $(OBJS)\horse.pcx $(OBJS)\horse.pnm $(OBJS)\horse.tif $(OBJS)\horse.xpm $(OBJS)\horse.cur $(OBJS)\horse.ico $(OBJS)\horse3.ani $(OBJS)\smile.xbm data: if not exist $(OBJS) mkdir $(OBJS) for %%f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse.tif horse.xpm horse.cur horse.ico horse3.ani smile.xbm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) $(OBJS)\image.exe: $(OBJS)\image_image.o $(OBJS)\image_image_rc.o - $(CXX) -o $@ $(OBJS)\image_image.o $(OBJS)\image_image_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -install: all - -uninstall: + $(CXX) -o $@ $(OBJS)\image_image.o $(OBJS)\image_image_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/image/makefile.vc b/samples/image/makefile.vc index 21087624b0..5454b6fc98 100644 --- a/samples/image/makefile.vc +++ b/samples/image/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +IMAGE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\image.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -IMAGE_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,23 +112,18 @@ $(OBJS)\image_image.obj: .\image.cpp $(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) $** $(OBJS)\image_image.res: .\image.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\image.exe del $(OBJS)\image.exe - -if exist $(OBJS)\horse.png $(OBJS)\horse.jpg $(OBJS)\horse.bmp $(OBJS)\horse.gif $(OBJS)\horse.pcx $(OBJS)\horse.pnm $(OBJS)\horse.tif $(OBJS)\horse.xpm $(OBJS)\horse.cur $(OBJS)\horse.ico $(OBJS)\horse3.ani $(OBJS)\smile.xbm del $(OBJS)\horse.png $(OBJS)\horse.jpg $(OBJS)\horse.bmp $(OBJS)\horse.gif $(OBJS)\horse.pcx $(OBJS)\horse.pnm $(OBJS)\horse.tif $(OBJS)\horse.xpm $(OBJS)\horse.cur $(OBJS)\horse.ico $(OBJS)\horse3.ani $(OBJS)\smile.xbm data: if not exist $(OBJS) mkdir $(OBJS) for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse.tif horse.xpm horse.cur horse.ico horse3.ani smile.xbm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\image.exe: $(OBJS)\image_image.obj $(OBJS)\image_image.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\image_image.obj $(OBJS)\image_image.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\image_image.obj $(OBJS)\image_image.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -install: all - -uninstall: diff --git a/samples/image/makefile.wat b/samples/image/makefile.wat index b9c94c5374..6d2b913b01 100644 --- a/samples/image/makefile.wat +++ b/samples/image/makefile.wat @@ -1,12 +1,151 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = image -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +IMAGE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\image.exe data + +$(OBJS)\image_image.obj : .AUTODEPEND .\image.cpp + $(CXX) -zq -fo=$^@ $(IMAGE_CXXFLAGS) $< + +$(OBJS)\image_image.res : .AUTODEPEND .\image.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\image.exe del $(OBJS)\image.exe + +data : + if not exist $(OBJS) mkdir $(OBJS) + for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse.tif horse.xpm horse.cur horse.ico horse3.ani smile.xbm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\image.exe : $(OBJS)\image_image.obj $(OBJS)\image_image.res + @%create $(OBJS)\image.lbc + @%append $(OBJS)\image.lbc option quiet + @%append $(OBJS)\image.lbc name $^@ + @%append $(OBJS)\image.lbc option incremental + @%append $(OBJS)\image.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\image_image.obj) do @%append $(OBJS)\image.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\image.lbc diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in index 63a0fb3b03..04410f12f1 100644 --- a/samples/internat/Makefile.in +++ b/samples/internat/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -INTERNAT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +INTERNAT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ INTERNAT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o internat$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o internat$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__internat___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__internat___mac_setfilecmd = $(SETFILE) -a C internat$(EXEEXT) +@COND_PLATFORM_MAC_1@__internat___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C internat$(EXEEXT) @COND_PLATFORM_WIN32_1@__internat___win32rc = internat_internat_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install internat$(EXEEXT): internat_internat.o $(__internat___win32rc) - $(CXX) -o $@ internat_internat.o $(__internat___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ internat_internat.o $(__internat___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__internat___mac_rezcmd) $(__internat___mac_setfilecmd) diff --git a/samples/internat/makefile.bcc b/samples/internat/makefile.bcc index 2c555132f4..0bdf512590 100644 --- a/samples/internat/makefile.bcc +++ b/samples/internat/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -INTERNAT_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +INTERNAT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\internat_internat.obj: .\internat.cpp $(CXX) -q -c -P -o$@ $(INTERNAT_CXXFLAGS) $** $(OBJS)\internat_internat.res: .\internat.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe -install: all - $(OBJS)\internat.exe: $(OBJS)\internat_internat.obj $(OBJS)\internat_internat.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\internat_internat.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\internat_internat.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\internat_internat.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\internat_internat.res | - -uninstall: diff --git a/samples/internat/makefile.gcc b/samples/internat/makefile.gcc index 292bf5da1a..9c56626292 100644 --- a/samples/internat/makefile.gcc +++ b/samples/internat/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +INTERNAT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -INTERNAT_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe -install: all - $(OBJS)\internat.exe: $(OBJS)\internat_internat.o $(OBJS)\internat_internat_rc.o - $(CXX) -o $@ $(OBJS)\internat_internat.o $(OBJS)\internat_internat_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\internat_internat.o $(OBJS)\internat_internat_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/internat/makefile.vc b/samples/internat/makefile.vc index 3e2c54d2ca..dea0af22df 100644 --- a/samples/internat/makefile.vc +++ b/samples/internat/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +INTERNAT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\internat.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -INTERNAT_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\internat_internat.obj: .\internat.cpp $(CXX) /c /nologo /TP /Fo$@ $(INTERNAT_CXXFLAGS) $** $(OBJS)\internat_internat.res: .\internat.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe -install: all - $(OBJS)\internat.exe: $(OBJS)\internat_internat.obj $(OBJS)\internat_internat.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\internat_internat.obj $(OBJS)\internat_internat.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\internat_internat.obj $(OBJS)\internat_internat.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/internat/makefile.wat b/samples/internat/makefile.wat index 7929589dcb..0d0dd9b18a 100644 --- a/samples/internat/makefile.wat +++ b/samples/internat/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = internat -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +INTERNAT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\internat.exe + +$(OBJS)\internat_internat.obj : .AUTODEPEND .\internat.cpp + $(CXX) -zq -fo=$^@ $(INTERNAT_CXXFLAGS) $< + +$(OBJS)\internat_internat.res : .AUTODEPEND .\internat.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe + +$(OBJS)\internat.exe : $(OBJS)\internat_internat.obj $(OBJS)\internat_internat.res + @%create $(OBJS)\internat.lbc + @%append $(OBJS)\internat.lbc option quiet + @%append $(OBJS)\internat.lbc name $^@ + @%append $(OBJS)\internat.lbc option incremental + @%append $(OBJS)\internat.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\internat_internat.obj) do @%append $(OBJS)\internat.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\internat.lbc diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in index 768961e8cf..97b7cf8a2f 100644 --- a/samples/ipc/Makefile.in +++ b/samples/ipc/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -IPC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +IPC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,32 +52,53 @@ IPC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_s @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o ipc$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o ipc$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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__ @@ -98,7 +124,7 @@ install: all install-strip: install ipc$(EXEEXT): ipc_ipc.o $(__ipc___win32rc) - $(CXX) -o $@ ipc_ipc.o $(__ipc___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ ipc_ipc.o $(__ipc___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__ipc___mac_rezcmd) $(__ipc___mac_setfilecmd) diff --git a/samples/ipc/makefile.bcc b/samples/ipc/makefile.bcc new file mode 100644 index 0000000000..20377f1b5f --- /dev/null +++ b/samples/ipc/makefile.bcc @@ -0,0 +1,135 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +IPC_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\ipc.exe + +$(OBJS)\ipc_ipc.obj: .\ipc.cpp + $(CXX) -q -c -P -o$@ $(IPC_CXXFLAGS) $** + +$(OBJS)\ipc_ipc.res: .\ipc.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\ipc.exe del $(OBJS)\ipc.exe + +$(OBJS)\ipc.exe: $(OBJS)\ipc_ipc.obj $(OBJS)\ipc_ipc.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\ipc_ipc.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\ipc_ipc.res +| diff --git a/samples/ipc/makefile.gcc b/samples/ipc/makefile.gcc index 4347679821..2ad21627e7 100644 --- a/samples/ipc/makefile.gcc +++ b/samples/ipc/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +IPC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -IPC_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\ipc.exe del $(OBJS)\ipc.exe -install: all - $(OBJS)\ipc.exe: $(OBJS)\ipc_ipc.o $(OBJS)\ipc_ipc_rc.o - $(CXX) -o $@ $(OBJS)\ipc_ipc.o $(OBJS)\ipc_ipc_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\ipc_ipc.o $(OBJS)\ipc_ipc_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/ipc/makefile.vc b/samples/ipc/makefile.vc index d8eab0036b..577a3d57d1 100644 --- a/samples/ipc/makefile.vc +++ b/samples/ipc/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +IPC_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\ipc.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -IPC_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\ipc_ipc.obj: .\ipc.cpp $(CXX) /c /nologo /TP /Fo$@ $(IPC_CXXFLAGS) $** $(OBJS)\ipc_ipc.res: .\ipc.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\ipc.exe del $(OBJS)\ipc.exe -install: all - $(OBJS)\ipc.exe: $(OBJS)\ipc_ipc.obj $(OBJS)\ipc_ipc.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\ipc_ipc.obj $(OBJS)\ipc_ipc.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\ipc_ipc.obj $(OBJS)\ipc_ipc.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/ipc/makefile.wat b/samples/ipc/makefile.wat index e70d34634f..c7dad02b0e 100644 --- a/samples/ipc/makefile.wat +++ b/samples/ipc/makefile.wat @@ -1,17 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -!include $(%WXWIN)\src\makewat.env - -all: - wmake -f server.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) - wmake -f client.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) - -clean: - wmake -f server.wat clean - wmake -f client.wat clean \ No newline at end of file +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +IPC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\ipc.exe + +$(OBJS)\ipc_ipc.obj : .AUTODEPEND .\ipc.cpp + $(CXX) -zq -fo=$^@ $(IPC_CXXFLAGS) $< + +$(OBJS)\ipc_ipc.res : .AUTODEPEND .\ipc.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\ipc.exe del $(OBJS)\ipc.exe + +$(OBJS)\ipc.exe : $(OBJS)\ipc_ipc.obj $(OBJS)\ipc_ipc.res + @%create $(OBJS)\ipc.lbc + @%append $(OBJS)\ipc.lbc option quiet + @%append $(OBJS)\ipc.lbc name $^@ + @%append $(OBJS)\ipc.lbc option incremental + @%append $(OBJS)\ipc.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\ipc_ipc.obj) do @%append $(OBJS)\ipc.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\ipc.lbc library %i + @%append $(OBJS)\ipc.lbc option resource=$(OBJS)\ipc_ipc.res + wlink @$(OBJS)\ipc.lbc diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in index cc5a1ceec9..b61daa6c93 100644 --- a/samples/joytest/Makefile.in +++ b/samples/joytest/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -JOYTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +JOYTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ JOYTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o joytest$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o joytest$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__joytest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__joytest___mac_setfilecmd = $(SETFILE) -a C joytest$(EXEEXT) +@COND_PLATFORM_MAC_1@__joytest___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C joytest$(EXEEXT) @COND_PLATFORM_WIN32_1@__joytest___win32rc = joytest_joytest_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install joytest$(EXEEXT): joytest_joytest.o $(__joytest___win32rc) - $(CXX) -o $@ joytest_joytest.o $(__joytest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ joytest_joytest.o $(__joytest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__joytest___mac_rezcmd) $(__joytest___mac_setfilecmd) diff --git a/samples/joytest/makefile.bcc b/samples/joytest/makefile.bcc index 30fb3384f4..2a6b77a0e4 100644 --- a/samples/joytest/makefile.bcc +++ b/samples/joytest/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -JOYTEST_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +JOYTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\joytest_joytest.obj: .\joytest.cpp $(CXX) -q -c -P -o$@ $(JOYTEST_CXXFLAGS) $** $(OBJS)\joytest_joytest.res: .\joytest.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\joytest.exe del $(OBJS)\joytest.exe -install: all - $(OBJS)\joytest.exe: $(OBJS)\joytest_joytest.obj $(OBJS)\joytest_joytest.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\joytest_joytest.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\joytest_joytest.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\joytest_joytest.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\joytest_joytest.res | - -uninstall: diff --git a/samples/joytest/makefile.gcc b/samples/joytest/makefile.gcc index c52e205fc9..b1eb34f444 100644 --- a/samples/joytest/makefile.gcc +++ b/samples/joytest/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### -JOYTEST_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +JOYTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\joytest.exe del $(OBJS)\joytest.exe -install: all - $(OBJS)\joytest.exe: $(OBJS)\joytest_joytest.o $(OBJS)\joytest_joytest_rc.o - $(CXX) -o $@ $(OBJS)\joytest_joytest.o $(OBJS)\joytest_joytest_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\joytest_joytest.o $(OBJS)\joytest_joytest_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/joytest/makefile.vc b/samples/joytest/makefile.vc index e4647b5e7e..d2d74a296b 100644 --- a/samples/joytest/makefile.vc +++ b/samples/joytest/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,7 +12,7 @@ WXUNIV = 0 ### Variables: ### -JOYTEST_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +JOYTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\joytest.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\joytest_joytest.obj: .\joytest.cpp $(CXX) /c /nologo /TP /Fo$@ $(JOYTEST_CXXFLAGS) $** $(OBJS)\joytest_joytest.res: .\joytest.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\joytest.exe del $(OBJS)\joytest.exe -install: all - $(OBJS)\joytest.exe: $(OBJS)\joytest_joytest.obj $(OBJS)\joytest_joytest.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\joytest_joytest.obj $(OBJS)\joytest_joytest.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\joytest_joytest.obj $(OBJS)\joytest_joytest.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/joytest/makefile.wat b/samples/joytest/makefile.wat index 2b88823bcf..03a25d1f78 100644 --- a/samples/joytest/makefile.wat +++ b/samples/joytest/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = joytest -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +JOYTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\joytest.exe + +$(OBJS)\joytest_joytest.obj : .AUTODEPEND .\joytest.cpp + $(CXX) -zq -fo=$^@ $(JOYTEST_CXXFLAGS) $< + +$(OBJS)\joytest_joytest.res : .AUTODEPEND .\joytest.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\joytest.exe del $(OBJS)\joytest.exe + +$(OBJS)\joytest.exe : $(OBJS)\joytest_joytest.obj $(OBJS)\joytest_joytest.res + @%create $(OBJS)\joytest.lbc + @%append $(OBJS)\joytest.lbc option quiet + @%append $(OBJS)\joytest.lbc name $^@ + @%append $(OBJS)\joytest.lbc option incremental + @%append $(OBJS)\joytest.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\joytest_joytest.obj) do @%append $(OBJS)\joytest.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\joytest.lbc diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in index 019ac514a1..cdd08f5154 100644 --- a/samples/keyboard/Makefile.in +++ b/samples/keyboard/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -KEYBOARD_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +KEYBOARD_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ KEYBOARD_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o keyboard$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o keyboard$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__keyboard___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__keyboard___mac_setfilecmd = $(SETFILE) -a C keyboard$(EXEEXT) +@COND_PLATFORM_MAC_1@__keyboard___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C keyboard$(EXEEXT) @COND_PLATFORM_WIN32_1@__keyboard___win32rc = keyboard_keyboard_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install keyboard$(EXEEXT): keyboard_keyboard.o $(__keyboard___win32rc) - $(CXX) -o $@ keyboard_keyboard.o $(__keyboard___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ keyboard_keyboard.o $(__keyboard___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__keyboard___mac_rezcmd) $(__keyboard___mac_setfilecmd) diff --git a/samples/keyboard/makefile.bcc b/samples/keyboard/makefile.bcc index efded264fb..1311b7844d 100644 --- a/samples/keyboard/makefile.bcc +++ b/samples/keyboard/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -KEYBOARD_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +KEYBOARD_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\keyboard_keyboard.obj: .\keyboard.cpp $(CXX) -q -c -P -o$@ $(KEYBOARD_CXXFLAGS) $** $(OBJS)\keyboard_keyboard.res: .\keyboard.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe -install: all - $(OBJS)\keyboard.exe: $(OBJS)\keyboard_keyboard.obj $(OBJS)\keyboard_keyboard.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\keyboard_keyboard.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\keyboard_keyboard.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\keyboard_keyboard.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\keyboard_keyboard.res | - -uninstall: diff --git a/samples/keyboard/makefile.gcc b/samples/keyboard/makefile.gcc index 087920f759..cdeb0d0b24 100644 --- a/samples/keyboard/makefile.gcc +++ b/samples/keyboard/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +KEYBOARD_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -KEYBOARD_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe -install: all - $(OBJS)\keyboard.exe: $(OBJS)\keyboard_keyboard.o $(OBJS)\keyboard_keyboard_rc.o - $(CXX) -o $@ $(OBJS)\keyboard_keyboard.o $(OBJS)\keyboard_keyboard_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\keyboard_keyboard.o $(OBJS)\keyboard_keyboard_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/keyboard/makefile.vc b/samples/keyboard/makefile.vc index f244ef4f8a..819348c4e2 100644 --- a/samples/keyboard/makefile.vc +++ b/samples/keyboard/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +KEYBOARD_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\keyboard.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -KEYBOARD_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\keyboard_keyboard.obj: .\keyboard.cpp $(CXX) /c /nologo /TP /Fo$@ $(KEYBOARD_CXXFLAGS) $** $(OBJS)\keyboard_keyboard.res: .\keyboard.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe -install: all - $(OBJS)\keyboard.exe: $(OBJS)\keyboard_keyboard.obj $(OBJS)\keyboard_keyboard.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\keyboard_keyboard.obj $(OBJS)\keyboard_keyboard.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\keyboard_keyboard.obj $(OBJS)\keyboard_keyboard.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/keyboard/makefile.wat b/samples/keyboard/makefile.wat index e8f6d37e7b..08161b3dad 100644 --- a/samples/keyboard/makefile.wat +++ b/samples/keyboard/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = keyboard -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +KEYBOARD_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\keyboard.exe + +$(OBJS)\keyboard_keyboard.obj : .AUTODEPEND .\keyboard.cpp + $(CXX) -zq -fo=$^@ $(KEYBOARD_CXXFLAGS) $< + +$(OBJS)\keyboard_keyboard.res : .AUTODEPEND .\keyboard.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe + +$(OBJS)\keyboard.exe : $(OBJS)\keyboard_keyboard.obj $(OBJS)\keyboard_keyboard.res + @%create $(OBJS)\keyboard.lbc + @%append $(OBJS)\keyboard.lbc option quiet + @%append $(OBJS)\keyboard.lbc name $^@ + @%append $(OBJS)\keyboard.lbc option incremental + @%append $(OBJS)\keyboard.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\keyboard_keyboard.obj) do @%append $(OBJS)\keyboard.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\keyboard.lbc diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in index 50ac7ef300..6eb9cd44d3 100644 --- a/samples/layout/Makefile.in +++ b/samples/layout/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -LAYOUT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +LAYOUT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ LAYOUT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(to @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o layout$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o layout$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__layout___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__layout___mac_setfilecmd = $(SETFILE) -a C layout$(EXEEXT) +@COND_PLATFORM_MAC_1@__layout___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C layout$(EXEEXT) @COND_PLATFORM_WIN32_1@__layout___win32rc = layout_layout_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install layout$(EXEEXT): layout_layout.o $(__layout___win32rc) - $(CXX) -o $@ layout_layout.o $(__layout___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ layout_layout.o $(__layout___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__layout___mac_rezcmd) $(__layout___mac_setfilecmd) diff --git a/samples/layout/makefile.bcc b/samples/layout/makefile.bcc index 34d07cb1e3..d4ae3eb27e 100644 --- a/samples/layout/makefile.bcc +++ b/samples/layout/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LAYOUT_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +LAYOUT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\layout_layout.obj: .\layout.cpp $(CXX) -q -c -P -o$@ $(LAYOUT_CXXFLAGS) $** $(OBJS)\layout_layout.res: .\layout.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe -install: all - $(OBJS)\layout.exe: $(OBJS)\layout_layout.obj $(OBJS)\layout_layout.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\layout_layout.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\layout_layout.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\layout_layout.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\layout_layout.res | - -uninstall: diff --git a/samples/layout/makefile.gcc b/samples/layout/makefile.gcc index 8ad81d31dd..45fe0d0641 100644 --- a/samples/layout/makefile.gcc +++ b/samples/layout/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +LAYOUT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LAYOUT_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe -install: all - $(OBJS)\layout.exe: $(OBJS)\layout_layout.o $(OBJS)\layout_layout_rc.o - $(CXX) -o $@ $(OBJS)\layout_layout.o $(OBJS)\layout_layout_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\layout_layout.o $(OBJS)\layout_layout_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/layout/makefile.vc b/samples/layout/makefile.vc index 51e75d6866..de3a764f75 100644 --- a/samples/layout/makefile.vc +++ b/samples/layout/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +LAYOUT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\layout.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LAYOUT_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\layout_layout.obj: .\layout.cpp $(CXX) /c /nologo /TP /Fo$@ $(LAYOUT_CXXFLAGS) $** $(OBJS)\layout_layout.res: .\layout.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe -install: all - $(OBJS)\layout.exe: $(OBJS)\layout_layout.obj $(OBJS)\layout_layout.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\layout_layout.obj $(OBJS)\layout_layout.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\layout_layout.obj $(OBJS)\layout_layout.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/layout/makefile.wat b/samples/layout/makefile.wat index 93b2ed28b8..40316fbb12 100644 --- a/samples/layout/makefile.wat +++ b/samples/layout/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = layout -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +LAYOUT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\layout.exe + +$(OBJS)\layout_layout.obj : .AUTODEPEND .\layout.cpp + $(CXX) -zq -fo=$^@ $(LAYOUT_CXXFLAGS) $< + +$(OBJS)\layout_layout.res : .AUTODEPEND .\layout.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe + +$(OBJS)\layout.exe : $(OBJS)\layout_layout.obj $(OBJS)\layout_layout.res + @%create $(OBJS)\layout.lbc + @%append $(OBJS)\layout.lbc option quiet + @%append $(OBJS)\layout.lbc name $^@ + @%append $(OBJS)\layout.lbc option incremental + @%append $(OBJS)\layout.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\layout_layout.obj) do @%append $(OBJS)\layout.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\layout.lbc diff --git a/samples/listbox/Makefile.in b/samples/listbox/Makefile.in index 2c639f91b9..80d47ab0f5 100644 --- a/samples/listbox/Makefile.in +++ b/samples/listbox/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -LISTBOX_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +LISTBOX_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ LISTBOX_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o listbox$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o listbox$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__listbox___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__listbox___mac_setfilecmd = $(SETFILE) -a C listbox$(EXEEXT) +@COND_PLATFORM_MAC_1@__listbox___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C listbox$(EXEEXT) @COND_PLATFORM_WIN32_1@__listbox___win32rc = listbox_listbox_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install listbox$(EXEEXT): listbox_listbox.o $(__listbox___win32rc) - $(CXX) -o $@ listbox_listbox.o $(__listbox___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ listbox_listbox.o $(__listbox___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__listbox___mac_rezcmd) $(__listbox___mac_setfilecmd) diff --git a/samples/listbox/makefile.bcc b/samples/listbox/makefile.bcc new file mode 100644 index 0000000000..d380c3e641 --- /dev/null +++ b/samples/listbox/makefile.bcc @@ -0,0 +1,135 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +LISTBOX_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\listbox.exe + +$(OBJS)\listbox_listbox.obj: .\listbox.cpp + $(CXX) -q -c -P -o$@ $(LISTBOX_CXXFLAGS) $** + +$(OBJS)\listbox_listbox.res: .\listbox.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\listbox.exe del $(OBJS)\listbox.exe + +$(OBJS)\listbox.exe: $(OBJS)\listbox_listbox.obj $(OBJS)\listbox_listbox.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\listbox_listbox.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\listbox_listbox.res +| diff --git a/samples/listbox/makefile.gcc b/samples/listbox/makefile.gcc index 7c971e5712..588c6043e0 100644 --- a/samples/listbox/makefile.gcc +++ b/samples/listbox/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +LISTBOX_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LISTBOX_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\listbox.exe del $(OBJS)\listbox.exe -install: all - $(OBJS)\listbox.exe: $(OBJS)\listbox_listbox.o $(OBJS)\listbox_listbox_rc.o - $(CXX) -o $@ $(OBJS)\listbox_listbox.o $(OBJS)\listbox_listbox_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\listbox_listbox.o $(OBJS)\listbox_listbox_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/listbox/makefile.vc b/samples/listbox/makefile.vc new file mode 100644 index 0000000000..64e15c75af --- /dev/null +++ b/samples/listbox/makefile.vc @@ -0,0 +1,125 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +LISTBOX_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\listbox.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = /d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\listbox.exe + +$(OBJS)\listbox_listbox.obj: .\listbox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(LISTBOX_CXXFLAGS) $** + +$(OBJS)\listbox_listbox.res: .\listbox.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\listbox.exe del $(OBJS)\listbox.exe + +$(OBJS)\listbox.exe: $(OBJS)\listbox_listbox.obj $(OBJS)\listbox_listbox.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\listbox_listbox.obj $(OBJS)\listbox_listbox.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib +<< diff --git a/samples/listbox/makefile.wat b/samples/listbox/makefile.wat new file mode 100644 index 0000000000..ca98cd8dc9 --- /dev/null +++ b/samples/listbox/makefile.wat @@ -0,0 +1,147 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +LISTBOX_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\listbox.exe + +$(OBJS)\listbox_listbox.obj : .AUTODEPEND .\listbox.cpp + $(CXX) -zq -fo=$^@ $(LISTBOX_CXXFLAGS) $< + +$(OBJS)\listbox_listbox.res : .AUTODEPEND .\listbox.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\listbox.exe del $(OBJS)\listbox.exe + +$(OBJS)\listbox.exe : $(OBJS)\listbox_listbox.obj $(OBJS)\listbox_listbox.res + @%create $(OBJS)\listbox.lbc + @%append $(OBJS)\listbox.lbc option quiet + @%append $(OBJS)\listbox.lbc name $^@ + @%append $(OBJS)\listbox.lbc option incremental + @%append $(OBJS)\listbox.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\listbox_listbox.obj) do @%append $(OBJS)\listbox.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\listbox.lbc library %i + @%append $(OBJS)\listbox.lbc option resource=$(OBJS)\listbox_listbox.res + wlink @$(OBJS)\listbox.lbc diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in index ef55fb4618..fea65e41d9 100644 --- a/samples/listctrl/Makefile.in +++ b/samples/listctrl/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -LISTCTRL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +LISTCTRL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ LISTCTRL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o listctrl$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o listctrl$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__listctrl___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__listctrl___mac_setfilecmd = $(SETFILE) -a C listctrl$(EXEEXT) +@COND_PLATFORM_MAC_1@__listctrl___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C listctrl$(EXEEXT) @COND_PLATFORM_WIN32_1@__listctrl___win32rc = listctrl_listtest_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install listctrl$(EXEEXT): listctrl_listtest.o $(__listctrl___win32rc) - $(CXX) -o $@ listctrl_listtest.o $(__listctrl___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ listctrl_listtest.o $(__listctrl___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__listctrl___mac_rezcmd) $(__listctrl___mac_setfilecmd) diff --git a/samples/listctrl/makefile.bcc b/samples/listctrl/makefile.bcc index 2133cb1fc5..510eab663c 100644 --- a/samples/listctrl/makefile.bcc +++ b/samples/listctrl/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LISTCTRL_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +LISTCTRL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -139,22 +118,18 @@ $(OBJS): all: $(OBJS)\listctrl.exe -$(OBJS)\listctrl_listctrl.obj: .\listctrl.cpp +$(OBJS)\listctrl_listtest.obj: .\listtest.cpp $(CXX) -q -c -P -o$@ $(LISTCTRL_CXXFLAGS) $** -$(OBJS)\listctrl_listctrl.res: .\listctrl.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** +$(OBJS)\listctrl_listtest.res: .\listtest.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\listctrl.exe del $(OBJS)\listctrl.exe -install: all - -$(OBJS)\listctrl.exe: $(OBJS)\listctrl_listctrl.obj $(OBJS)\listctrl_listctrl.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\listctrl_listctrl.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\listctrl_listctrl.res +$(OBJS)\listctrl.exe: $(OBJS)\listctrl_listtest.obj $(OBJS)\listctrl_listtest.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\listctrl_listtest.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\listctrl_listtest.res | - -uninstall: diff --git a/samples/listctrl/makefile.gcc b/samples/listctrl/makefile.gcc index 0b6b9b0574..f0e05024e9 100644 --- a/samples/listctrl/makefile.gcc +++ b/samples/listctrl/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +LISTCTRL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LISTCTRL_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\listctrl.exe del $(OBJS)\listctrl.exe -install: all - $(OBJS)\listctrl.exe: $(OBJS)\listctrl_listtest.o $(OBJS)\listctrl_listtest_rc.o - $(CXX) -o $@ $(OBJS)\listctrl_listtest.o $(OBJS)\listctrl_listtest_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\listctrl_listtest.o $(OBJS)\listctrl_listtest_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/listctrl/makefile.vc b/samples/listctrl/makefile.vc index f0e86bddac..f4d109b0e5 100644 --- a/samples/listctrl/makefile.vc +++ b/samples/listctrl/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +LISTCTRL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\listctrl.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LISTCTRL_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -108,22 +108,18 @@ $(OBJS): all: $(OBJS)\listctrl.exe -$(OBJS)\listctrl_listctrl.obj: .\listctrl.cpp +$(OBJS)\listctrl_listtest.obj: .\listtest.cpp $(CXX) /c /nologo /TP /Fo$@ $(LISTCTRL_CXXFLAGS) $** -$(OBJS)\listctrl_listctrl.res: .\listctrl.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** +$(OBJS)\listctrl_listtest.res: .\listtest.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\listctrl.exe del $(OBJS)\listctrl.exe -install: all - -$(OBJS)\listctrl.exe: $(OBJS)\listctrl_listctrl.obj $(OBJS)\listctrl_listctrl.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\listctrl_listctrl.obj $(OBJS)\listctrl_listctrl.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib +$(OBJS)\listctrl.exe: $(OBJS)\listctrl_listtest.obj $(OBJS)\listctrl_listtest.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\listctrl_listtest.obj $(OBJS)\listctrl_listtest.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/listctrl/makefile.wat b/samples/listctrl/makefile.wat index acd60f1311..2f80bad9cd 100644 --- a/samples/listctrl/makefile.wat +++ b/samples/listctrl/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = listtest -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +LISTCTRL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\listctrl.exe + +$(OBJS)\listctrl_listtest.obj : .AUTODEPEND .\listtest.cpp + $(CXX) -zq -fo=$^@ $(LISTCTRL_CXXFLAGS) $< + +$(OBJS)\listctrl_listtest.res : .AUTODEPEND .\listtest.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\listctrl.exe del $(OBJS)\listctrl.exe + +$(OBJS)\listctrl.exe : $(OBJS)\listctrl_listtest.obj $(OBJS)\listctrl_listtest.res + @%create $(OBJS)\listctrl.lbc + @%append $(OBJS)\listctrl.lbc option quiet + @%append $(OBJS)\listctrl.lbc name $^@ + @%append $(OBJS)\listctrl.lbc option incremental + @%append $(OBJS)\listctrl.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\listctrl_listtest.obj) do @%append $(OBJS)\listctrl.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\listctrl.lbc diff --git a/samples/makefile.bcc b/samples/makefile.bcc new file mode 100644 index 0000000000..f082b800a6 --- /dev/null +++ b/samples/makefile.bcc @@ -0,0 +1,54 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +__console___depname = console +!endif + + +### Targets: ### + +all: artprov $(__console___depname) dialogs image minimal + +artprov: + (cd artprov && $(MAKE) all) + +clean: + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + +!if "$(USE_GUI)" == "0" +console: + (cd console && $(MAKE) all) +!endif + +dialogs: + (cd dialogs && $(MAKE) all) + +image: + (cd image && $(MAKE) all) + +minimal: + (cd minimal && $(MAKE) all) diff --git a/samples/makefile.gcc b/samples/makefile.gcc index d7573c863c..af9267c4f4 100644 --- a/samples/makefile.gcc +++ b/samples/makefile.gcc @@ -1,21 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Build GUI libraries? [0,1] -USE_GUI = 1 +include ../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -40,11 +29,6 @@ artprov: clean: -if exist .\*.o del .\*.o - (cd artprov && $(MAKE) clean) - (cd console && $(MAKE) clean) - (cd dialogs && $(MAKE) clean) - (cd image && $(MAKE) clean) - (cd minimal && $(MAKE) clean) ifeq ($(USE_GUI),0) console: @@ -57,16 +41,7 @@ dialogs: image: (cd image && $(MAKE) all) -install: all - (cd artprov && $(MAKE) install) - (cd console && $(MAKE) install) - (cd dialogs && $(MAKE) install) - (cd image && $(MAKE) install) - (cd minimal && $(MAKE) install) - minimal: (cd minimal && $(MAKE) all) -uninstall: - -.PHONY: all artprov console dialogs image minimal +.PHONY: all artprov clean console dialogs image minimal diff --git a/samples/makefile.vc b/samples/makefile.vc index 127336e385..d3ead159bc 100644 --- a/samples/makefile.vc +++ b/samples/makefile.vc @@ -1,16 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Build GUI libraries? [0,1] -USE_GUI = 1 +!include <../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -38,21 +32,6 @@ artprov: clean: -if exist .\*.obj del .\*.obj -if exist .\*.res del .\*.res - cd artprov - $(MAKE) /$(MAKEFLAGS) clean - cd $(MAKEDIR) - cd console - $(MAKE) /$(MAKEFLAGS) clean - cd $(MAKEDIR) - cd dialogs - $(MAKE) /$(MAKEFLAGS) clean - cd $(MAKEDIR) - cd image - $(MAKE) /$(MAKEFLAGS) clean - cd $(MAKEDIR) - cd minimal - $(MAKE) /$(MAKEFLAGS) clean - cd $(MAKEDIR) !if "$(USE_GUI)" == "0" console: @@ -71,26 +50,7 @@ image: $(MAKE) /$(MAKEFLAGS) all cd $(MAKEDIR) -install: all - cd artprov - $(MAKE) /$(MAKEFLAGS) install - cd $(MAKEDIR) - cd console - $(MAKE) /$(MAKEFLAGS) install - cd $(MAKEDIR) - cd dialogs - $(MAKE) /$(MAKEFLAGS) install - cd $(MAKEDIR) - cd image - $(MAKE) /$(MAKEFLAGS) install - cd $(MAKEDIR) - cd minimal - $(MAKE) /$(MAKEFLAGS) install - cd $(MAKEDIR) - minimal: cd minimal $(MAKE) /$(MAKEFLAGS) all cd $(MAKEDIR) - -uninstall: diff --git a/samples/makefile.wat b/samples/makefile.wat index b9e47bcb42..36b101ce69 100644 --- a/samples/makefile.wat +++ b/samples/makefile.wat @@ -1,278 +1,75 @@ -# -# File: makefile.wat -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh -# -# "%W% %G%" -# -# Makefile : Builds samples for windows with Watcom -# Use FINAL=1 argument to wmake to build final version with no debugging -# info +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= -# Set WXDIR for your system -WXDIR=$(%WXWIN) +!include ../build/config.wat -THISDIR=$(WXDIR)\samples +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- -!include $(WXDIR)\src\makewat.env +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif -MAKEFLAGS=FINAL=$(FINAL) UNICODE=$(UNICODE) WXUSINGDLL=$(WXUSINGDLL) +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- -# -# Please keep samples list up-to-date, in alphabetical order -# -all: - cd $(WXDIR)\samples\artprov - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\calendar - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\caret - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\checklst - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\config - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\controls - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\db - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\dialogs - -wmake -f makefile.wat $(MAKEFLAGS) -!if "$(COMPIL)"=="" - cd $(WXDIR)\samples\dialup - -wmake -f makefile.wat $(MAKEFLAGS) -!endif - cd $(WXDIR)\samples\dnd - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\docview - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\docvwmdi - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\dragimag - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\drawing - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\dynamic - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\erase - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\event - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\font - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\grid - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\help - -wmake -f makefile.wat $(MAKEFLAGS) -!if "$(PNGSETUP)"=="" - cd $(WXDIR)\samples\html - -wmake -f makefile.wat $(MAKEFLAGS) +### Conditionally set variables: ### + +__console___depname = +!ifeq USE_GUI 0 +__console___depname = console !endif - cd $(WXDIR)\samples\image - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\internat - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\ipc - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\joytest - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\keyboard - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\layout - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\listctrl - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\mdi - -wmake -f makefile.wat $(MAKEFLAGS) -#!if "$(FINAL)" == "0" -# cd $(WXDIR)\samples\memcheck -# -wmake -f makefile.wat $(MAKEFLAGS) -#!endif - cd $(WXDIR)\samples\menu - -wmake -f makefile.wat $(MAKEFLAGS) -!if "$(COMPIL)"=="" - cd $(WXDIR)\samples\mfc - -wmake -f makefile.wat $(MAKEFLAGS) + +### Variables: ### + + + + +### Targets: ### + +all : .SYMBOLIC artprov $(__console___depname) dialogs image minimal + +artprov : .SYMBOLIC + cd artprov + wmake $(__MAKEOPTS__) all + cd $(WATCOM_CWD) + +clean : .SYMBOLIC + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + -if exist .\*.lbc del .\*.lbc + -if exist .\*.ilk del .\*.ilk + +!ifeq USE_GUI 0 +console : .SYMBOLIC + cd console + wmake $(__MAKEOPTS__) all + cd $(WATCOM_CWD) !endif - cd $(WXDIR)\samples\minifram - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\minimal - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\nativdlg - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\newgrid - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\notebook - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\oleauto - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\ownerdrw - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\png - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\printing - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\proplist - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\propsize - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\regtest - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\resource - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\rotate - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\sashtest - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\scroll - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\scrollsub - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\sockets - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\splitter - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\statbar - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\taskbar - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\text - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\thread - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\toolbar - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\treectrl - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\typetest - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\validate - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\widgets - -wmake -f makefile.wat $(MAKEFLAGS) - cd $(WXDIR)\samples\wizard - -wmake -f makefile.wat $(MAKEFLAGS) -clean: - cd $(WXDIR)\samples\calendar - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\caret - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\checklst - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\config - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\controls - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\db - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\dialogs - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\dialup - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\dnd - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\docview - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\docvwmdi - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\drawing - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\dragimag - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\dynamic - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\erase - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\event - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\font - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\grid - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\help - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\html - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\image - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\internat - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\ipc - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\joytest - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\keyboard - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\layout - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\listctrl - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\mdi - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\mfc - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\memcheck - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\menu - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\minifram - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\minimal - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\nativdlg - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\newgrid - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\notebook - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\oleauto - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\ownerdrw - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\png - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\printing - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\proplist - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\propsize - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\regtest - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\resource - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\rotate - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\sashtest - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\scroll - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\scrollsub - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\sockets - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\splitter - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\statbar - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\taskbar - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\text - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\thread - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\toolbar - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\treectrl - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\typetest - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\validate - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\widgets - -wmake -f makefile.wat clean - cd $(WXDIR)\samples\wizard - -wmake -f makefile.wat clean +dialogs : .SYMBOLIC + cd dialogs + wmake $(__MAKEOPTS__) all + cd $(WATCOM_CWD) + +image : .SYMBOLIC + cd image + wmake $(__MAKEOPTS__) all + cd $(WATCOM_CWD) + +minimal : .SYMBOLIC + cd minimal + wmake $(__MAKEOPTS__) all + cd $(WATCOM_CWD) diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in index 8a6600a7b0..16e546bf3a 100644 --- a/samples/mdi/Makefile.in +++ b/samples/mdi/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -MDI_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +MDI_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,32 +52,53 @@ MDI_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_s @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o mdi$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o mdi$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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__ @@ -98,7 +124,7 @@ install: all install-strip: install mdi$(EXEEXT): mdi_mdi.o $(__mdi___win32rc) - $(CXX) -o $@ mdi_mdi.o $(__mdi___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ mdi_mdi.o $(__mdi___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__mdi___mac_rezcmd) $(__mdi___mac_setfilecmd) diff --git a/samples/mdi/makefile.bcc b/samples/mdi/makefile.bcc index 7111bb94a4..63b8e4c4db 100644 --- a/samples/mdi/makefile.bcc +++ b/samples/mdi/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -MDI_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +MDI_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\mdi_mdi.obj: .\mdi.cpp $(CXX) -q -c -P -o$@ $(MDI_CXXFLAGS) $** $(OBJS)\mdi_mdi.res: .\mdi.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe -install: all - $(OBJS)\mdi.exe: $(OBJS)\mdi_mdi.obj $(OBJS)\mdi_mdi.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\mdi_mdi.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\mdi_mdi.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\mdi_mdi.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\mdi_mdi.res | - -uninstall: diff --git a/samples/mdi/makefile.gcc b/samples/mdi/makefile.gcc index 69dc318b61..22e59584df 100644 --- a/samples/mdi/makefile.gcc +++ b/samples/mdi/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +MDI_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -MDI_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe -install: all - $(OBJS)\mdi.exe: $(OBJS)\mdi_mdi.o $(OBJS)\mdi_mdi_rc.o - $(CXX) -o $@ $(OBJS)\mdi_mdi.o $(OBJS)\mdi_mdi_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\mdi_mdi.o $(OBJS)\mdi_mdi_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/mdi/makefile.vc b/samples/mdi/makefile.vc index b3bfbffdec..99bbeeaa10 100644 --- a/samples/mdi/makefile.vc +++ b/samples/mdi/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +MDI_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\mdi.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -MDI_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\mdi_mdi.obj: .\mdi.cpp $(CXX) /c /nologo /TP /Fo$@ $(MDI_CXXFLAGS) $** $(OBJS)\mdi_mdi.res: .\mdi.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe -install: all - $(OBJS)\mdi.exe: $(OBJS)\mdi_mdi.obj $(OBJS)\mdi_mdi.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\mdi_mdi.obj $(OBJS)\mdi_mdi.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\mdi_mdi.obj $(OBJS)\mdi_mdi.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/mdi/makefile.wat b/samples/mdi/makefile.wat index a997aacc27..b1c5da3c3b 100644 --- a/samples/mdi/makefile.wat +++ b/samples/mdi/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = mdi -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +MDI_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\mdi.exe + +$(OBJS)\mdi_mdi.obj : .AUTODEPEND .\mdi.cpp + $(CXX) -zq -fo=$^@ $(MDI_CXXFLAGS) $< + +$(OBJS)\mdi_mdi.res : .AUTODEPEND .\mdi.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe + +$(OBJS)\mdi.exe : $(OBJS)\mdi_mdi.obj $(OBJS)\mdi_mdi.res + @%create $(OBJS)\mdi.lbc + @%append $(OBJS)\mdi.lbc option quiet + @%append $(OBJS)\mdi.lbc name $^@ + @%append $(OBJS)\mdi.lbc option incremental + @%append $(OBJS)\mdi.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\mdi_mdi.obj) do @%append $(OBJS)\mdi.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\mdi.lbc diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in index 7c9ae5133c..cd3e1cc392 100644 --- a/samples/memcheck/Makefile.in +++ b/samples/memcheck/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -MEMCHECK_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +MEMCHECK_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ MEMCHECK_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o memcheck$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o memcheck$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__memcheck___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__memcheck___mac_setfilecmd = $(SETFILE) -a C memcheck$(EXEEXT) +@COND_PLATFORM_MAC_1@__memcheck___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C memcheck$(EXEEXT) @COND_PLATFORM_WIN32_1@__memcheck___win32rc = memcheck_memcheck_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install memcheck$(EXEEXT): memcheck_memcheck.o $(__memcheck___win32rc) - $(CXX) -o $@ memcheck_memcheck.o $(__memcheck___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ memcheck_memcheck.o $(__memcheck___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__memcheck___mac_rezcmd) $(__memcheck___mac_setfilecmd) diff --git a/samples/memcheck/makefile.bcc b/samples/memcheck/makefile.bcc index 22b3dd9a58..0aa781ba52 100644 --- a/samples/memcheck/makefile.bcc +++ b/samples/memcheck/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -MEMCHECK_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +MEMCHECK_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\memcheck_memcheck.obj: .\memcheck.cpp $(CXX) -q -c -P -o$@ $(MEMCHECK_CXXFLAGS) $** $(OBJS)\memcheck_memcheck.res: .\memcheck.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe -install: all - $(OBJS)\memcheck.exe: $(OBJS)\memcheck_memcheck.obj $(OBJS)\memcheck_memcheck.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\memcheck_memcheck.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\memcheck_memcheck.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\memcheck_memcheck.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\memcheck_memcheck.res | - -uninstall: diff --git a/samples/memcheck/makefile.gcc b/samples/memcheck/makefile.gcc index 90a71d84d7..4a255fd759 100644 --- a/samples/memcheck/makefile.gcc +++ b/samples/memcheck/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +MEMCHECK_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -MEMCHECK_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe -install: all - $(OBJS)\memcheck.exe: $(OBJS)\memcheck_memcheck.o $(OBJS)\memcheck_memcheck_rc.o - $(CXX) -o $@ $(OBJS)\memcheck_memcheck.o $(OBJS)\memcheck_memcheck_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\memcheck_memcheck.o $(OBJS)\memcheck_memcheck_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/memcheck/makefile.vc b/samples/memcheck/makefile.vc index d7fc743c9e..c95fcf96ec 100644 --- a/samples/memcheck/makefile.vc +++ b/samples/memcheck/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +MEMCHECK_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\memcheck.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -MEMCHECK_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\memcheck_memcheck.obj: .\memcheck.cpp $(CXX) /c /nologo /TP /Fo$@ $(MEMCHECK_CXXFLAGS) $** $(OBJS)\memcheck_memcheck.res: .\memcheck.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe -install: all - $(OBJS)\memcheck.exe: $(OBJS)\memcheck_memcheck.obj $(OBJS)\memcheck_memcheck.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\memcheck_memcheck.obj $(OBJS)\memcheck_memcheck.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\memcheck_memcheck.obj $(OBJS)\memcheck_memcheck.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/memcheck/makefile.wat b/samples/memcheck/makefile.wat index b8df352dfb..3dee637e78 100644 --- a/samples/memcheck/makefile.wat +++ b/samples/memcheck/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = memcheck -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +MEMCHECK_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\memcheck.exe + +$(OBJS)\memcheck_memcheck.obj : .AUTODEPEND .\memcheck.cpp + $(CXX) -zq -fo=$^@ $(MEMCHECK_CXXFLAGS) $< + +$(OBJS)\memcheck_memcheck.res : .AUTODEPEND .\memcheck.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe + +$(OBJS)\memcheck.exe : $(OBJS)\memcheck_memcheck.obj $(OBJS)\memcheck_memcheck.res + @%create $(OBJS)\memcheck.lbc + @%append $(OBJS)\memcheck.lbc option quiet + @%append $(OBJS)\memcheck.lbc name $^@ + @%append $(OBJS)\memcheck.lbc option incremental + @%append $(OBJS)\memcheck.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\memcheck_memcheck.obj) do @%append $(OBJS)\memcheck.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\memcheck.lbc diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in index 0a4ca7ca2b..a569b3b7e9 100644 --- a/samples/menu/Makefile.in +++ b/samples/menu/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -MENU_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +MENU_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ MENU_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_ @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o menu$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o menu$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__menu___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__menu___mac_setfilecmd = $(SETFILE) -a C menu$(EXEEXT) +@COND_PLATFORM_MAC_1@__menu___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C menu$(EXEEXT) @COND_PLATFORM_WIN32_1@__menu___win32rc = menu_menu_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install menu$(EXEEXT): menu_menu.o $(__menu___win32rc) - $(CXX) -o $@ menu_menu.o $(__menu___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ menu_menu.o $(__menu___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__menu___mac_rezcmd) $(__menu___mac_setfilecmd) diff --git a/samples/menu/makefile.bcc b/samples/menu/makefile.bcc index 6c72e12f8d..e3d4299153 100644 --- a/samples/menu/makefile.bcc +++ b/samples/menu/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -MENU_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +MENU_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\menu_menu.obj: .\menu.cpp $(CXX) -q -c -P -o$@ $(MENU_CXXFLAGS) $** $(OBJS)\menu_menu.res: .\menu.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe -install: all - $(OBJS)\menu.exe: $(OBJS)\menu_menu.obj $(OBJS)\menu_menu.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\menu_menu.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\menu_menu.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\menu_menu.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\menu_menu.res | - -uninstall: diff --git a/samples/menu/makefile.gcc b/samples/menu/makefile.gcc index 38ed50dca2..b88d9eb420 100644 --- a/samples/menu/makefile.gcc +++ b/samples/menu/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +MENU_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -MENU_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe -install: all - $(OBJS)\menu.exe: $(OBJS)\menu_menu.o $(OBJS)\menu_menu_rc.o - $(CXX) -o $@ $(OBJS)\menu_menu.o $(OBJS)\menu_menu_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\menu_menu.o $(OBJS)\menu_menu_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/menu/makefile.vc b/samples/menu/makefile.vc index 7d0260e4a5..b9c814005c 100644 --- a/samples/menu/makefile.vc +++ b/samples/menu/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +MENU_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\menu.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -MENU_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\menu_menu.obj: .\menu.cpp $(CXX) /c /nologo /TP /Fo$@ $(MENU_CXXFLAGS) $** $(OBJS)\menu_menu.res: .\menu.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe -install: all - $(OBJS)\menu.exe: $(OBJS)\menu_menu.obj $(OBJS)\menu_menu.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\menu_menu.obj $(OBJS)\menu_menu.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\menu_menu.obj $(OBJS)\menu_menu.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/menu/makefile.wat b/samples/menu/makefile.wat index 827af955ca..fe9a528495 100644 --- a/samples/menu/makefile.wat +++ b/samples/menu/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = menu -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +MENU_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\menu.exe + +$(OBJS)\menu_menu.obj : .AUTODEPEND .\menu.cpp + $(CXX) -zq -fo=$^@ $(MENU_CXXFLAGS) $< + +$(OBJS)\menu_menu.res : .AUTODEPEND .\menu.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe + +$(OBJS)\menu.exe : $(OBJS)\menu_menu.obj $(OBJS)\menu_menu.res + @%create $(OBJS)\menu.lbc + @%append $(OBJS)\menu.lbc option quiet + @%append $(OBJS)\menu.lbc name $^@ + @%append $(OBJS)\menu.lbc option incremental + @%append $(OBJS)\menu.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\menu_menu.obj) do @%append $(OBJS)\menu.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\menu.lbc diff --git a/samples/mfc/Makefile.in b/samples/mfc/Makefile.in index de6ff4ecb7..3e41677b48 100644 --- a/samples/mfc/Makefile.in +++ b/samples/mfc/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -MFC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +MFC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,32 +52,53 @@ MFC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_s @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o mfc$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o mfc$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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__ @@ -98,7 +124,7 @@ install: all install-strip: install mfc$(EXEEXT): mfc_mfc.o $(__mfc___win32rc) - $(CXX) -o $@ mfc_mfc.o $(__mfc___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ mfc_mfc.o $(__mfc___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__mfc___mac_rezcmd) $(__mfc___mac_setfilecmd) diff --git a/samples/mfc/makefile.bcc b/samples/mfc/makefile.bcc index b612da6349..bd4025aa78 100644 --- a/samples/mfc/makefile.bcc +++ b/samples/mfc/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -MFC_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +MFC_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\mfc_mfc.obj: .\mfc.cpp $(CXX) -q -c -P -o$@ $(MFC_CXXFLAGS) $** $(OBJS)\mfc_mfc.res: .\mfc.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\mfc.exe del $(OBJS)\mfc.exe -install: all - $(OBJS)\mfc.exe: $(OBJS)\mfc_mfc.obj $(OBJS)\mfc_mfc.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\mfc_mfc.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\mfc_mfc.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\mfc_mfc.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\mfc_mfc.res | - -uninstall: diff --git a/samples/mfc/makefile.gcc b/samples/mfc/makefile.gcc index 126f60ba21..7f3ec40b0e 100644 --- a/samples/mfc/makefile.gcc +++ b/samples/mfc/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +MFC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -MFC_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\mfc.exe del $(OBJS)\mfc.exe -install: all - $(OBJS)\mfc.exe: $(OBJS)\mfc_mfc.o $(OBJS)\mfc_mfc_rc.o - $(CXX) -o $@ $(OBJS)\mfc_mfc.o $(OBJS)\mfc_mfc_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\mfc_mfc.o $(OBJS)\mfc_mfc_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/mfc/makefile.vc b/samples/mfc/makefile.vc index e97f576c29..22a35f8909 100644 --- a/samples/mfc/makefile.vc +++ b/samples/mfc/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +MFC_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\mfc.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -MFC_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\mfc_mfc.obj: .\mfc.cpp $(CXX) /c /nologo /TP /Fo$@ $(MFC_CXXFLAGS) $** $(OBJS)\mfc_mfc.res: .\mfc.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\mfc.exe del $(OBJS)\mfc.exe -install: all - $(OBJS)\mfc.exe: $(OBJS)\mfc_mfc.obj $(OBJS)\mfc_mfc.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\mfc_mfc.obj $(OBJS)\mfc_mfc.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\mfc_mfc.obj $(OBJS)\mfc_mfc.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/mfc/makefile.wat b/samples/mfc/makefile.wat index 4b53426173..667743482a 100644 --- a/samples/mfc/makefile.wat +++ b/samples/mfc/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = mfc -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +MFC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\mfc.exe + +$(OBJS)\mfc_mfc.obj : .AUTODEPEND .\mfc.cpp + $(CXX) -zq -fo=$^@ $(MFC_CXXFLAGS) $< + +$(OBJS)\mfc_mfc.res : .AUTODEPEND .\mfc.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\mfc.exe del $(OBJS)\mfc.exe + +$(OBJS)\mfc.exe : $(OBJS)\mfc_mfc.obj $(OBJS)\mfc_mfc.res + @%create $(OBJS)\mfc.lbc + @%append $(OBJS)\mfc.lbc option quiet + @%append $(OBJS)\mfc.lbc name $^@ + @%append $(OBJS)\mfc.lbc option incremental + @%append $(OBJS)\mfc.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\mfc_mfc.obj) do @%append $(OBJS)\mfc.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\mfc.lbc library %i + @%append $(OBJS)\mfc.lbc option resource=$(OBJS)\mfc_mfc.res + wlink @$(OBJS)\mfc.lbc diff --git a/samples/minifram/Makefile.in b/samples/minifram/Makefile.in index ff082879ed..727e31e07c 100644 --- a/samples/minifram/Makefile.in +++ b/samples/minifram/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -MINIFRAM_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +MINIFRAM_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ MINIFRAM_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o minifram$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o minifram$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__minifram___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__minifram___mac_setfilecmd = $(SETFILE) -a C minifram$(EXEEXT) +@COND_PLATFORM_MAC_1@__minifram___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C minifram$(EXEEXT) @COND_PLATFORM_WIN32_1@__minifram___win32rc = minifram_minifram_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install minifram$(EXEEXT): minifram_minifram.o $(__minifram___win32rc) - $(CXX) -o $@ minifram_minifram.o $(__minifram___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ minifram_minifram.o $(__minifram___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__minifram___mac_rezcmd) $(__minifram___mac_setfilecmd) diff --git a/samples/minifram/makefile.bcc b/samples/minifram/makefile.bcc index 452d01a52b..18c1707ca7 100644 --- a/samples/minifram/makefile.bcc +++ b/samples/minifram/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -MINIFRAM_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +MINIFRAM_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\minifram_minifram.obj: .\minifram.cpp $(CXX) -q -c -P -o$@ $(MINIFRAM_CXXFLAGS) $** $(OBJS)\minifram_minifram.res: .\minifram.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\minifram.exe del $(OBJS)\minifram.exe -install: all - $(OBJS)\minifram.exe: $(OBJS)\minifram_minifram.obj $(OBJS)\minifram_minifram.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\minifram_minifram.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\minifram_minifram.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\minifram_minifram.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\minifram_minifram.res | - -uninstall: diff --git a/samples/minifram/makefile.gcc b/samples/minifram/makefile.gcc index 0ef65112bc..ad92b58407 100644 --- a/samples/minifram/makefile.gcc +++ b/samples/minifram/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +MINIFRAM_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -MINIFRAM_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\minifram.exe del $(OBJS)\minifram.exe -install: all - $(OBJS)\minifram.exe: $(OBJS)\minifram_minifram.o $(OBJS)\minifram_minifram_rc.o - $(CXX) -o $@ $(OBJS)\minifram_minifram.o $(OBJS)\minifram_minifram_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\minifram_minifram.o $(OBJS)\minifram_minifram_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/minifram/makefile.vc b/samples/minifram/makefile.vc index 3a82ad2da9..4e90991f0f 100644 --- a/samples/minifram/makefile.vc +++ b/samples/minifram/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +MINIFRAM_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\minifram.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -MINIFRAM_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\minifram_minifram.obj: .\minifram.cpp $(CXX) /c /nologo /TP /Fo$@ $(MINIFRAM_CXXFLAGS) $** $(OBJS)\minifram_minifram.res: .\minifram.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\minifram.exe del $(OBJS)\minifram.exe -install: all - $(OBJS)\minifram.exe: $(OBJS)\minifram_minifram.obj $(OBJS)\minifram_minifram.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\minifram_minifram.obj $(OBJS)\minifram_minifram.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\minifram_minifram.obj $(OBJS)\minifram_minifram.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/minifram/makefile.wat b/samples/minifram/makefile.wat index 06a707a87e..c70984b0ea 100644 --- a/samples/minifram/makefile.wat +++ b/samples/minifram/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = minifram -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +MINIFRAM_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\minifram.exe + +$(OBJS)\minifram_minifram.obj : .AUTODEPEND .\minifram.cpp + $(CXX) -zq -fo=$^@ $(MINIFRAM_CXXFLAGS) $< + +$(OBJS)\minifram_minifram.res : .AUTODEPEND .\minifram.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\minifram.exe del $(OBJS)\minifram.exe + +$(OBJS)\minifram.exe : $(OBJS)\minifram_minifram.obj $(OBJS)\minifram_minifram.res + @%create $(OBJS)\minifram.lbc + @%append $(OBJS)\minifram.lbc option quiet + @%append $(OBJS)\minifram.lbc name $^@ + @%append $(OBJS)\minifram.lbc option incremental + @%append $(OBJS)\minifram.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\minifram_minifram.obj) do @%append $(OBJS)\minifram.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\minifram.lbc library %i + @%append $(OBJS)\minifram.lbc option resource=$(OBJS)\minifram_minifram.res + wlink @$(OBJS)\minifram.lbc diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in index 348c194303..efd3d5264b 100644 --- a/samples/minimal/Makefile.in +++ b/samples/minimal/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,13 +32,17 @@ top_srcdir = @top_srcdir@ ### Variables: ### -MINIMAL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +MINIMAL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) -@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -48,36 +54,58 @@ MINIMAL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__minimal___mac_rezcmd = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o minimal$(EXEEXT) $(MACOSX_RESOURCES) mondrian.r -@COND_PLATFORM_MAC_1@__minimal___mac_setfilecmd = $(SETFILE) -a C minimal$(EXEEXT) +@COND_PLATFORM_MAC_1@__minimal___mac_rezcmd = \ +@COND_PLATFORM_MAC_1@ $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_PLATFORM_MAC_1@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_PLATFORM_MAC_1@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_PLATFORM_MAC_1@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) \ +@COND_PLATFORM_MAC_1@ $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o \ +@COND_PLATFORM_MAC_1@ minimal$(EXEEXT) $(MACOSX_RESOURCES) mondrian.r +@COND_PLATFORM_MAC_1@__minimal___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C minimal$(EXEEXT) @COND_PLATFORM_WIN32_1@__minimal___win32rc = minimal_minimal_rc.o ### Targets: ### @@ -98,7 +126,7 @@ install: all install-strip: install minimal$(EXEEXT): minimal_minimal.o $(__minimal___win32rc) - $(CXX) -o $@ minimal_minimal.o $(__minimal___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ minimal_minimal.o $(__minimal___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__minimal___mac_rezcmd) $(__minimal___mac_setfilecmd) diff --git a/samples/minimal/makefile.bcc b/samples/minimal/makefile.bcc index 6df2c4f89f..9cbf6a1712 100644 --- a/samples/minimal/makefile.bcc +++ b/samples/minimal/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -MINIMAL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +MINIMAL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -120,6 +73,18 @@ __OPTIMIZEFLAG_2 = -Od !if "$(BUILD)" == "release" __OPTIMIZEFLAG_2 = -O2 !endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -130,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -162,11 +129,7 @@ clean: -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\minimal.exe del $(OBJS)\minimal.exe -install: all - $(OBJS)\minimal.exe: $(OBJS)\minimal_minimal.obj $(OBJS)\minimal_minimal.res - ilink32 -Tpe $(LDFLAGS) $(__DEBUGFLAG) -tWM -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\minimal_minimal.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mti.lib,, $(OBJS)\minimal_minimal.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\minimal_minimal.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\minimal_minimal.res | - -uninstall: diff --git a/samples/minimal/makefile.gcc b/samples/minimal/makefile.gcc index c7ea7d0cf2..70c6b47da9 100644 --- a/samples/minimal/makefile.gcc +++ b/samples/minimal/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,8 +12,8 @@ WXUNIV = 0 ### Variables: ### -OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) MINIMAL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -138,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\minimal.exe del $(OBJS)\minimal.exe -install: all - $(OBJS)\minimal.exe: $(OBJS)\minimal_minimal.o $(OBJS)\minimal_minimal_rc.o - $(CXX) -o $@ $(OBJS)\minimal_minimal.o $(OBJS)\minimal_minimal_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\minimal_minimal.o $(OBJS)\minimal_minimal_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all clean install uninstall +.PHONY: all clean diff --git a/samples/minimal/makefile.vc b/samples/minimal/makefile.vc index d309162a1a..34dc2222c2 100644 --- a/samples/minimal/makefile.vc +++ b/samples/minimal/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +MINIMAL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\minimal.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -MINIMAL_CXXFLAGS = $(CPPFLAGS) /MD$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\minimal.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -101,6 +71,12 @@ __OPTIMIZEFLAG_3 = /Od !if "$(BUILD)" == "release" __OPTIMIZEFLAG_3 = /O2 !endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -143,11 +119,7 @@ clean: -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\minimal.exe del $(OBJS)\minimal.exe -install: all - $(OBJS)\minimal.exe: $(OBJS)\minimal_minimal.obj $(OBJS)\minimal_minimal.res link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\minimal_minimal.obj $(OBJS)\minimal_minimal.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + $(OBJS)\minimal_minimal.obj $(OBJS)\minimal_minimal.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/minimal/makefile.wat b/samples/minimal/makefile.wat index 55a142f038..4e4bbc6f39 100644 --- a/samples/minimal/makefile.wat +++ b/samples/minimal/makefile.wat @@ -1,41 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = wpp386 -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include ../../build/config.wat # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -110,6 +79,13 @@ __OPTIMIZEFLAG_2 = -od !ifeq BUILD release __OPTIMIZEFLAG_2 = -ot -ox !endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif __UNICODE_DEFINE_p = !ifeq UNICODE 1 __UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 @@ -133,8 +109,8 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ ### Variables: ### +MINIMAL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -MINIMAL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm -br -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) @@ -159,8 +135,6 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\minimal.exe del $(OBJS)\minimal.exe -install : .SYMBOLIC all - $(OBJS)\minimal.exe : $(OBJS)\minimal_minimal.obj $(OBJS)\minimal_minimal.res @%create $(OBJS)\minimal.lbc @%append $(OBJS)\minimal.lbc option quiet @@ -168,8 +142,6 @@ $(OBJS)\minimal.exe : $(OBJS)\minimal_minimal.obj $(OBJS)\minimal_minimal.res @%append $(OBJS)\minimal.lbc option incremental @%append $(OBJS)\minimal.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' @for %i in ( $(OBJS)\minimal_minimal.obj) do @%append $(OBJS)\minimal.lbc file %i - @for %i in ( $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\minimal.lbc library %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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_minimal.res wlink @$(OBJS)\minimal.lbc - -uninstall : .SYMBOLIC diff --git a/samples/mobile/Makefile.in b/samples/mobile/Makefile.in index d0810ba0fa..8e686b2ad7 100644 --- a/samples/mobile/Makefile.in +++ b/samples/mobile/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -MOBILE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +MOBILE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ MOBILE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(to @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o mobile$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o mobile$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__mobile___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__mobile___mac_setfilecmd = $(SETFILE) -a C mobile$(EXEEXT) +@COND_PLATFORM_MAC_1@__mobile___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C mobile$(EXEEXT) @COND_PLATFORM_WIN32_1@__mobile___win32rc = mobile_mobile_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install mobile$(EXEEXT): mobile_mobile.o $(__mobile___win32rc) - $(CXX) -o $@ mobile_mobile.o $(__mobile___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ mobile_mobile.o $(__mobile___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__mobile___mac_rezcmd) $(__mobile___mac_setfilecmd) diff --git a/samples/mobile/makefile.bcc b/samples/mobile/makefile.bcc new file mode 100644 index 0000000000..5d3b77a74d --- /dev/null +++ b/samples/mobile/makefile.bcc @@ -0,0 +1,135 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +MOBILE_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\mobile.exe + +$(OBJS)\mobile_mobile.obj: .\mobile.cpp + $(CXX) -q -c -P -o$@ $(MOBILE_CXXFLAGS) $** + +$(OBJS)\mobile_mobile.res: .\mobile.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\mobile.exe del $(OBJS)\mobile.exe + +$(OBJS)\mobile.exe: $(OBJS)\mobile_mobile.obj $(OBJS)\mobile_mobile.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\mobile_mobile.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\mobile_mobile.res +| diff --git a/samples/mobile/makefile.gcc b/samples/mobile/makefile.gcc index 7a4afe0911..d6f076a515 100644 --- a/samples/mobile/makefile.gcc +++ b/samples/mobile/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +MOBILE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -MOBILE_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\mobile.exe del $(OBJS)\mobile.exe -install: all - $(OBJS)\mobile.exe: $(OBJS)\mobile_mobile.o $(OBJS)\mobile_mobile_rc.o - $(CXX) -o $@ $(OBJS)\mobile_mobile.o $(OBJS)\mobile_mobile_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\mobile_mobile.o $(OBJS)\mobile_mobile_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/mobile/makefile.vc b/samples/mobile/makefile.vc new file mode 100644 index 0000000000..97f15189a7 --- /dev/null +++ b/samples/mobile/makefile.vc @@ -0,0 +1,125 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +MOBILE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\mobile.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = /d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\mobile.exe + +$(OBJS)\mobile_mobile.obj: .\mobile.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MOBILE_CXXFLAGS) $** + +$(OBJS)\mobile_mobile.res: .\mobile.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\mobile.exe del $(OBJS)\mobile.exe + +$(OBJS)\mobile.exe: $(OBJS)\mobile_mobile.obj $(OBJS)\mobile_mobile.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\mobile_mobile.obj $(OBJS)\mobile_mobile.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib +<< diff --git a/samples/mobile/makefile.wat b/samples/mobile/makefile.wat new file mode 100644 index 0000000000..9254a67e41 --- /dev/null +++ b/samples/mobile/makefile.wat @@ -0,0 +1,147 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +MOBILE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\mobile.exe + +$(OBJS)\mobile_mobile.obj : .AUTODEPEND .\mobile.cpp + $(CXX) -zq -fo=$^@ $(MOBILE_CXXFLAGS) $< + +$(OBJS)\mobile_mobile.res : .AUTODEPEND .\mobile.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\mobile.exe del $(OBJS)\mobile.exe + +$(OBJS)\mobile.exe : $(OBJS)\mobile_mobile.obj $(OBJS)\mobile_mobile.res + @%create $(OBJS)\mobile.lbc + @%append $(OBJS)\mobile.lbc option quiet + @%append $(OBJS)\mobile.lbc name $^@ + @%append $(OBJS)\mobile.lbc option incremental + @%append $(OBJS)\mobile.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\mobile_mobile.obj) do @%append $(OBJS)\mobile.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\mobile.lbc library %i + @%append $(OBJS)\mobile.lbc option resource=$(OBJS)\mobile_mobile.res + wlink @$(OBJS)\mobile.lbc diff --git a/samples/multimon/Makefile.in b/samples/multimon/Makefile.in index a00358ebe5..6671719cdb 100644 --- a/samples/multimon/Makefile.in +++ b/samples/multimon/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -MULTIMON_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +MULTIMON_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ MULTIMON_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o multimon$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o multimon$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__multimon___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__multimon___mac_setfilecmd = $(SETFILE) -a C multimon$(EXEEXT) +@COND_PLATFORM_MAC_1@__multimon___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C multimon$(EXEEXT) @COND_PLATFORM_WIN32_1@__multimon___win32rc = multimon_multimon_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install multimon$(EXEEXT): multimon_multimon.o $(__multimon___win32rc) - $(CXX) -o $@ multimon_multimon.o $(__multimon___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ multimon_multimon.o $(__multimon___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__multimon___mac_rezcmd) $(__multimon___mac_setfilecmd) diff --git a/samples/multimon/makefile.bcc b/samples/multimon/makefile.bcc new file mode 100644 index 0000000000..c4e73b6088 --- /dev/null +++ b/samples/multimon/makefile.bcc @@ -0,0 +1,135 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +MULTIMON_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\multimon.exe + +$(OBJS)\multimon_multimon.obj: .\multimon.cpp + $(CXX) -q -c -P -o$@ $(MULTIMON_CXXFLAGS) $** + +$(OBJS)\multimon_multimon.res: .\multimon.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\multimon.exe del $(OBJS)\multimon.exe + +$(OBJS)\multimon.exe: $(OBJS)\multimon_multimon.obj $(OBJS)\multimon_multimon.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\multimon_multimon.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\multimon_multimon.res +| diff --git a/samples/multimon/makefile.gcc b/samples/multimon/makefile.gcc index edb8c6e1f8..b9a91b070a 100644 --- a/samples/multimon/makefile.gcc +++ b/samples/multimon/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +MULTIMON_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -MULTIMON_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\multimon.exe del $(OBJS)\multimon.exe -install: all - $(OBJS)\multimon.exe: $(OBJS)\multimon_multimon.o $(OBJS)\multimon_multimon_rc.o - $(CXX) -o $@ $(OBJS)\multimon_multimon.o $(OBJS)\multimon_multimon_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\multimon_multimon.o $(OBJS)\multimon_multimon_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/multimon/makefile.vc b/samples/multimon/makefile.vc new file mode 100644 index 0000000000..c48692f54e --- /dev/null +++ b/samples/multimon/makefile.vc @@ -0,0 +1,125 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +MULTIMON_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\multimon.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = /d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\multimon.exe + +$(OBJS)\multimon_multimon.obj: .\multimon.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MULTIMON_CXXFLAGS) $** + +$(OBJS)\multimon_multimon.res: .\multimon.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\multimon.exe del $(OBJS)\multimon.exe + +$(OBJS)\multimon.exe: $(OBJS)\multimon_multimon.obj $(OBJS)\multimon_multimon.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\multimon_multimon.obj $(OBJS)\multimon_multimon.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib +<< diff --git a/samples/multimon/makefile.wat b/samples/multimon/makefile.wat new file mode 100644 index 0000000000..cf13c3616d --- /dev/null +++ b/samples/multimon/makefile.wat @@ -0,0 +1,147 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +MULTIMON_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\multimon.exe + +$(OBJS)\multimon_multimon.obj : .AUTODEPEND .\multimon.cpp + $(CXX) -zq -fo=$^@ $(MULTIMON_CXXFLAGS) $< + +$(OBJS)\multimon_multimon.res : .AUTODEPEND .\multimon.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\multimon.exe del $(OBJS)\multimon.exe + +$(OBJS)\multimon.exe : $(OBJS)\multimon_multimon.obj $(OBJS)\multimon_multimon.res + @%create $(OBJS)\multimon.lbc + @%append $(OBJS)\multimon.lbc option quiet + @%append $(OBJS)\multimon.lbc name $^@ + @%append $(OBJS)\multimon.lbc option incremental + @%append $(OBJS)\multimon.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\multimon_multimon.obj) do @%append $(OBJS)\multimon.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\multimon.lbc library %i + @%append $(OBJS)\multimon.lbc option resource=$(OBJS)\multimon_multimon.res + wlink @$(OBJS)\multimon.lbc diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in index 499e55c9a1..66a0058442 100644 --- a/samples/nativdlg/Makefile.in +++ b/samples/nativdlg/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -NATIVDLG_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +NATIVDLG_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ NATIVDLG_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o nativdlg$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o nativdlg$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__nativdlg___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__nativdlg___mac_setfilecmd = $(SETFILE) -a C nativdlg$(EXEEXT) +@COND_PLATFORM_MAC_1@__nativdlg___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C nativdlg$(EXEEXT) @COND_PLATFORM_WIN32_1@__nativdlg___win32rc = nativdlg_nativdlg_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install nativdlg$(EXEEXT): nativdlg_nativdlg.o $(__nativdlg___win32rc) - $(CXX) -o $@ nativdlg_nativdlg.o $(__nativdlg___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ nativdlg_nativdlg.o $(__nativdlg___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__nativdlg___mac_rezcmd) $(__nativdlg___mac_setfilecmd) diff --git a/samples/nativdlg/makefile.bcc b/samples/nativdlg/makefile.bcc index f79051d2c6..239492cece 100644 --- a/samples/nativdlg/makefile.bcc +++ b/samples/nativdlg/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -NATIVDLG_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +NATIVDLG_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\nativdlg_nativdlg.obj: .\nativdlg.cpp $(CXX) -q -c -P -o$@ $(NATIVDLG_CXXFLAGS) $** $(OBJS)\nativdlg_nativdlg.res: .\nativdlg.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\nativdlg.exe del $(OBJS)\nativdlg.exe -install: all - $(OBJS)\nativdlg.exe: $(OBJS)\nativdlg_nativdlg.obj $(OBJS)\nativdlg_nativdlg.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\nativdlg_nativdlg.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\nativdlg_nativdlg.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\nativdlg_nativdlg.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\nativdlg_nativdlg.res | - -uninstall: diff --git a/samples/nativdlg/makefile.gcc b/samples/nativdlg/makefile.gcc index ce94be3661..9f9dd5f9ac 100644 --- a/samples/nativdlg/makefile.gcc +++ b/samples/nativdlg/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +NATIVDLG_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -NATIVDLG_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\nativdlg.exe del $(OBJS)\nativdlg.exe -install: all - $(OBJS)\nativdlg.exe: $(OBJS)\nativdlg_nativdlg.o $(OBJS)\nativdlg_nativdlg_rc.o - $(CXX) -o $@ $(OBJS)\nativdlg_nativdlg.o $(OBJS)\nativdlg_nativdlg_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\nativdlg_nativdlg.o $(OBJS)\nativdlg_nativdlg_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/nativdlg/makefile.vc b/samples/nativdlg/makefile.vc index ff0001fbf4..a69fc8b307 100644 --- a/samples/nativdlg/makefile.vc +++ b/samples/nativdlg/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +NATIVDLG_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\nativdlg.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -NATIVDLG_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\nativdlg_nativdlg.obj: .\nativdlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(NATIVDLG_CXXFLAGS) $** $(OBJS)\nativdlg_nativdlg.res: .\nativdlg.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\nativdlg.exe del $(OBJS)\nativdlg.exe -install: all - $(OBJS)\nativdlg.exe: $(OBJS)\nativdlg_nativdlg.obj $(OBJS)\nativdlg_nativdlg.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\nativdlg_nativdlg.obj $(OBJS)\nativdlg_nativdlg.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\nativdlg_nativdlg.obj $(OBJS)\nativdlg_nativdlg.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/nativdlg/makefile.wat b/samples/nativdlg/makefile.wat index 3d796268f7..8b6bb628d1 100644 --- a/samples/nativdlg/makefile.wat +++ b/samples/nativdlg/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = nativdlg -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +NATIVDLG_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\nativdlg.exe + +$(OBJS)\nativdlg_nativdlg.obj : .AUTODEPEND .\nativdlg.cpp + $(CXX) -zq -fo=$^@ $(NATIVDLG_CXXFLAGS) $< + +$(OBJS)\nativdlg_nativdlg.res : .AUTODEPEND .\nativdlg.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\nativdlg.exe del $(OBJS)\nativdlg.exe + +$(OBJS)\nativdlg.exe : $(OBJS)\nativdlg_nativdlg.obj $(OBJS)\nativdlg_nativdlg.res + @%create $(OBJS)\nativdlg.lbc + @%append $(OBJS)\nativdlg.lbc option quiet + @%append $(OBJS)\nativdlg.lbc name $^@ + @%append $(OBJS)\nativdlg.lbc option incremental + @%append $(OBJS)\nativdlg.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\nativdlg_nativdlg.obj) do @%append $(OBJS)\nativdlg.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\nativdlg.lbc diff --git a/samples/newgrid/Makefile.in b/samples/newgrid/Makefile.in index 1789ac0e7a..cc89feec4c 100644 --- a/samples/newgrid/Makefile.in +++ b/samples/newgrid/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -NEWGRID_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +NEWGRID_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ NEWGRID_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o newgrid$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o newgrid$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__newgrid___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__newgrid___mac_setfilecmd = $(SETFILE) -a C newgrid$(EXEEXT) +@COND_PLATFORM_MAC_1@__newgrid___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C newgrid$(EXEEXT) @COND_PLATFORM_WIN32_1@__newgrid___win32rc = newgrid_newgrid_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install newgrid$(EXEEXT): newgrid_newgrid.o $(__newgrid___win32rc) - $(CXX) -o $@ newgrid_newgrid.o $(__newgrid___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ newgrid_newgrid.o $(__newgrid___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__newgrid___mac_rezcmd) $(__newgrid___mac_setfilecmd) diff --git a/samples/newgrid/makefile.bcc b/samples/newgrid/makefile.bcc new file mode 100644 index 0000000000..0c1a2c222e --- /dev/null +++ b/samples/newgrid/makefile.bcc @@ -0,0 +1,135 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +NEWGRID_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\newgrid.exe + +$(OBJS)\newgrid_newgrid.obj: .\newgrid.cpp + $(CXX) -q -c -P -o$@ $(NEWGRID_CXXFLAGS) $** + +$(OBJS)\newgrid_newgrid.res: .\newgrid.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\newgrid.exe del $(OBJS)\newgrid.exe + +$(OBJS)\newgrid.exe: $(OBJS)\newgrid_newgrid.obj $(OBJS)\newgrid_newgrid.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\newgrid_newgrid.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\newgrid_newgrid.res +| diff --git a/samples/newgrid/makefile.gcc b/samples/newgrid/makefile.gcc index b9636b7961..fa7e7aef9b 100644 --- a/samples/newgrid/makefile.gcc +++ b/samples/newgrid/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### -NEWGRID_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +NEWGRID_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\newgrid.exe del $(OBJS)\newgrid.exe -install: all - $(OBJS)\newgrid.exe: $(OBJS)\newgrid_newgrid.o $(OBJS)\newgrid_newgrid_rc.o - $(CXX) -o $@ $(OBJS)\newgrid_newgrid.o $(OBJS)\newgrid_newgrid_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\newgrid_newgrid.o $(OBJS)\newgrid_newgrid_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/newgrid/makefile.vc b/samples/newgrid/makefile.vc new file mode 100644 index 0000000000..39857b6efe --- /dev/null +++ b/samples/newgrid/makefile.vc @@ -0,0 +1,125 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +NEWGRID_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\newgrid.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = /d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\newgrid.exe + +$(OBJS)\newgrid_newgrid.obj: .\newgrid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NEWGRID_CXXFLAGS) $** + +$(OBJS)\newgrid_newgrid.res: .\newgrid.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\newgrid.exe del $(OBJS)\newgrid.exe + +$(OBJS)\newgrid.exe: $(OBJS)\newgrid_newgrid.obj $(OBJS)\newgrid_newgrid.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\newgrid_newgrid.obj $(OBJS)\newgrid_newgrid.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib +<< diff --git a/samples/newgrid/makefile.wat b/samples/newgrid/makefile.wat new file mode 100644 index 0000000000..6b9b3a1b6b --- /dev/null +++ b/samples/newgrid/makefile.wat @@ -0,0 +1,147 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +NEWGRID_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\newgrid.exe + +$(OBJS)\newgrid_newgrid.obj : .AUTODEPEND .\newgrid.cpp + $(CXX) -zq -fo=$^@ $(NEWGRID_CXXFLAGS) $< + +$(OBJS)\newgrid_newgrid.res : .AUTODEPEND .\newgrid.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\newgrid.exe del $(OBJS)\newgrid.exe + +$(OBJS)\newgrid.exe : $(OBJS)\newgrid_newgrid.obj $(OBJS)\newgrid_newgrid.res + @%create $(OBJS)\newgrid.lbc + @%append $(OBJS)\newgrid.lbc option quiet + @%append $(OBJS)\newgrid.lbc name $^@ + @%append $(OBJS)\newgrid.lbc option incremental + @%append $(OBJS)\newgrid.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\newgrid_newgrid.obj) do @%append $(OBJS)\newgrid.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\newgrid.lbc library %i + @%append $(OBJS)\newgrid.lbc option resource=$(OBJS)\newgrid_newgrid.res + wlink @$(OBJS)\newgrid.lbc diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in index 43996cc8c8..7772e2013a 100644 --- a/samples/notebook/Makefile.in +++ b/samples/notebook/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -NOTEBOOK_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +NOTEBOOK_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ NOTEBOOK_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o notebook$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o notebook$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__notebook___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__notebook___mac_setfilecmd = $(SETFILE) -a C notebook$(EXEEXT) +@COND_PLATFORM_MAC_1@__notebook___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C notebook$(EXEEXT) @COND_PLATFORM_WIN32_1@__notebook___win32rc = notebook_notebook_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install notebook$(EXEEXT): notebook_notebook.o $(__notebook___win32rc) - $(CXX) -o $@ notebook_notebook.o $(__notebook___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ notebook_notebook.o $(__notebook___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__notebook___mac_rezcmd) $(__notebook___mac_setfilecmd) diff --git a/samples/notebook/makefile.bcc b/samples/notebook/makefile.bcc index 989388bfe1..f4e21229cb 100644 --- a/samples/notebook/makefile.bcc +++ b/samples/notebook/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -NOTEBOOK_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +NOTEBOOK_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\notebook_notebook.obj: .\notebook.cpp $(CXX) -q -c -P -o$@ $(NOTEBOOK_CXXFLAGS) $** $(OBJS)\notebook_notebook.res: .\notebook.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\notebook.exe del $(OBJS)\notebook.exe -install: all - $(OBJS)\notebook.exe: $(OBJS)\notebook_notebook.obj $(OBJS)\notebook_notebook.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\notebook_notebook.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\notebook_notebook.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\notebook_notebook.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\notebook_notebook.res | - -uninstall: diff --git a/samples/notebook/makefile.gcc b/samples/notebook/makefile.gcc index 0e554d526c..fc7b321af1 100644 --- a/samples/notebook/makefile.gcc +++ b/samples/notebook/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### +NOTEBOOK_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -NOTEBOOK_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\notebook.exe del $(OBJS)\notebook.exe -install: all - $(OBJS)\notebook.exe: $(OBJS)\notebook_notebook.o $(OBJS)\notebook_notebook_rc.o - $(CXX) -o $@ $(OBJS)\notebook_notebook.o $(OBJS)\notebook_notebook_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\notebook_notebook.o $(OBJS)\notebook_notebook_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/notebook/makefile.vc b/samples/notebook/makefile.vc index cb2a8c5190..5dad312e7a 100644 --- a/samples/notebook/makefile.vc +++ b/samples/notebook/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### +NOTEBOOK_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\notebook.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -NOTEBOOK_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\notebook_notebook.obj: .\notebook.cpp $(CXX) /c /nologo /TP /Fo$@ $(NOTEBOOK_CXXFLAGS) $** $(OBJS)\notebook_notebook.res: .\notebook.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\notebook.exe del $(OBJS)\notebook.exe -install: all - $(OBJS)\notebook.exe: $(OBJS)\notebook_notebook.obj $(OBJS)\notebook_notebook.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\notebook_notebook.obj $(OBJS)\notebook_notebook.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\notebook_notebook.obj $(OBJS)\notebook_notebook.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/notebook/makefile.wat b/samples/notebook/makefile.wat index db4ec80c45..28a6113bd7 100644 --- a/samples/notebook/makefile.wat +++ b/samples/notebook/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = notebook -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +NOTEBOOK_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\notebook.exe + +$(OBJS)\notebook_notebook.obj : .AUTODEPEND .\notebook.cpp + $(CXX) -zq -fo=$^@ $(NOTEBOOK_CXXFLAGS) $< + +$(OBJS)\notebook_notebook.res : .AUTODEPEND .\notebook.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\notebook.exe del $(OBJS)\notebook.exe + +$(OBJS)\notebook.exe : $(OBJS)\notebook_notebook.obj $(OBJS)\notebook_notebook.res + @%create $(OBJS)\notebook.lbc + @%append $(OBJS)\notebook.lbc option quiet + @%append $(OBJS)\notebook.lbc name $^@ + @%append $(OBJS)\notebook.lbc option incremental + @%append $(OBJS)\notebook.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\notebook_notebook.obj) do @%append $(OBJS)\notebook.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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_notebook.res + wlink @$(OBJS)\notebook.lbc diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in index 4f91d37842..dcf289fa15 100644 --- a/samples/oleauto/Makefile.in +++ b/samples/oleauto/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -OLEAUTO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +OLEAUTO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ OLEAUTO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o oleauto$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o oleauto$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__oleauto___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__oleauto___mac_setfilecmd = $(SETFILE) -a C oleauto$(EXEEXT) +@COND_PLATFORM_MAC_1@__oleauto___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C oleauto$(EXEEXT) @COND_PLATFORM_WIN32_1@__oleauto___win32rc = oleauto_oleauto_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install oleauto$(EXEEXT): oleauto_oleauto.o $(__oleauto___win32rc) - $(CXX) -o $@ oleauto_oleauto.o $(__oleauto___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ oleauto_oleauto.o $(__oleauto___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__oleauto___mac_rezcmd) $(__oleauto___mac_setfilecmd) diff --git a/samples/oleauto/makefile.bcc b/samples/oleauto/makefile.bcc new file mode 100644 index 0000000000..5bc8e98454 --- /dev/null +++ b/samples/oleauto/makefile.bcc @@ -0,0 +1,135 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OLEAUTO_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\oleauto.exe + +$(OBJS)\oleauto_oleauto.obj: .\oleauto.cpp + $(CXX) -q -c -P -o$@ $(OLEAUTO_CXXFLAGS) $** + +$(OBJS)\oleauto_oleauto.res: .\oleauto.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe + +$(OBJS)\oleauto.exe: $(OBJS)\oleauto_oleauto.obj $(OBJS)\oleauto_oleauto.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\oleauto_oleauto.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\oleauto_oleauto.res +| diff --git a/samples/oleauto/makefile.gcc b/samples/oleauto/makefile.gcc index 5190bbec24..6a62a3e2ca 100644 --- a/samples/oleauto/makefile.gcc +++ b/samples/oleauto/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -48,10 +13,13 @@ WXUNIV = 0 ### Variables: ### OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OLEAUTO_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OLEAUTO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe -install: all - $(OBJS)\oleauto.exe: $(OBJS)\oleauto_oleauto.o $(OBJS)\oleauto_oleauto_rc.o - $(CXX) -o $@ $(OBJS)\oleauto_oleauto.o $(OBJS)\oleauto_oleauto_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\oleauto_oleauto.o $(OBJS)\oleauto_oleauto_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/oleauto/makefile.vc b/samples/oleauto/makefile.vc index 8fe3d97461..40bcbc2f4c 100644 --- a/samples/oleauto/makefile.vc +++ b/samples/oleauto/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -43,7 +13,7 @@ WXUNIV = 0 ### Variables: ### OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OLEAUTO_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +OLEAUTO_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\oleauto.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\oleauto_oleauto.obj: .\oleauto.cpp $(CXX) /c /nologo /TP /Fo$@ $(OLEAUTO_CXXFLAGS) $** $(OBJS)\oleauto_oleauto.res: .\oleauto.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe -install: all - $(OBJS)\oleauto.exe: $(OBJS)\oleauto_oleauto.obj $(OBJS)\oleauto_oleauto.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\oleauto_oleauto.obj $(OBJS)\oleauto_oleauto.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\oleauto_oleauto.obj $(OBJS)\oleauto_oleauto.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/oleauto/makefile.wat b/samples/oleauto/makefile.wat index 80c6d3a811..03710e3be2 100644 --- a/samples/oleauto/makefile.wat +++ b/samples/oleauto/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = oleauto -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OLEAUTO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\oleauto.exe + +$(OBJS)\oleauto_oleauto.obj : .AUTODEPEND .\oleauto.cpp + $(CXX) -zq -fo=$^@ $(OLEAUTO_CXXFLAGS) $< + +$(OBJS)\oleauto_oleauto.res : .AUTODEPEND .\oleauto.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe + +$(OBJS)\oleauto.exe : $(OBJS)\oleauto_oleauto.obj $(OBJS)\oleauto_oleauto.res + @%create $(OBJS)\oleauto.lbc + @%append $(OBJS)\oleauto.lbc option quiet + @%append $(OBJS)\oleauto.lbc name $^@ + @%append $(OBJS)\oleauto.lbc option incremental + @%append $(OBJS)\oleauto.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\oleauto_oleauto.obj) do @%append $(OBJS)\oleauto.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\oleauto.lbc diff --git a/samples/opengl/Makefile.in b/samples/opengl/Makefile.in index c3ab152012..b39666fdee 100644 --- a/samples/opengl/Makefile.in +++ b/samples/opengl/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -10,103 +10,34 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ INSTALL = @INSTALL@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ -EXTRALIBS = @EXTRALIBS@ -EXTRALIBS_GUI = @EXTRALIBS_GUI@ -LDFLAGS = @LDFLAGS@ -LDFLAGS_GUI = @LDFLAGS_GUI@ -RESCOMP = @RESCOMP@ -SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ -SETFILE = @SETFILE@ -TOOLKIT = @TOOLKIT@ -TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ -TOOLKIT_VERSION = @TOOLKIT_VERSION@ -srcdir = @srcdir@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ ### Variables: ### -OPENGL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### -@COND_DEPS_TRACKING_0@CXXC = $(CXX) -@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) -@COND_USE_GUI_0@PORTNAME = base -@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) -@COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_DEBUG@WXDEBUGFLAG = d -@COND_UNICODE_1@WXUNICODEFLAG = u -@COND_WXUNIV_1@WXUNIVNAME = univ -@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o opengl$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_PLATFORM_MAC_1@__opengl___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__opengl___mac_setfilecmd = $(SETFILE) -a C opengl$(EXEEXT) -@COND_PLATFORM_WIN32_1@__opengl___win32rc = opengl_opengl_rc.o ### Targets: ### -all: opengl$(EXEEXT) +all: cube clean: rm -rf ./.deps rm -f -f ./*.o - rm -f opengl$(EXEEXT) + (cd cube && $(MAKE) clean) + +cube: + (cd cube && $(MAKE) all) distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh install: all + (cd cube && $(MAKE) install) install-strip: install - -opengl$(EXEEXT): opengl_opengl.o $(__opengl___win32rc) - $(CXX) -o $@ opengl_opengl.o $(__opengl___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) - $(__opengl___mac_rezcmd) - $(__opengl___mac_setfilecmd) - -opengl_opengl.o: $(srcdir)/opengl.cpp - $(CXXC) -c -o $@ $(OPENGL_CXXFLAGS) $< - -opengl_opengl_rc.o: $(srcdir)/opengl.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) + (cd cube && $(MAKE) install-strip) uninstall: @@ -114,4 +45,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean cube distclean install uninstall diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in index 5207759b08..9d68f7a69f 100644 --- a/samples/opengl/cube/Makefile.in +++ b/samples/opengl/cube/Makefile.in @@ -1,25 +1,144 @@ -# -# File: Makefile.in -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for html about example (UNIX). +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= -top_srcdir = @top_srcdir@/.. -top_builddir = ../../.. -program_dir = samples/opengl/cube -PROGRAM=cube +@MAKE_SET@ -LIBRARIES=$(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@ $(OPENGLLIBS) +prefix = @prefix@ +exec_prefix = @exec_prefix@ +INSTALL = @INSTALL@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXFLAGS = @CXXFLAGS@ +EXEEXT = @EXEEXT@ +EXTRALIBS = @EXTRALIBS@ +EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ +LDFLAGS = @LDFLAGS@ +LDFLAGS_GUI = @LDFLAGS_GUI@ +RESCOMP = @RESCOMP@ +SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ +TOOLKIT = @TOOLKIT@ +TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ +TOOLKIT_VERSION = @TOOLKIT_VERSION@ +srcdir = @srcdir@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ -OBJECTS =$(PROGRAM).o -DEPFILES=$(PROGRAM).d +### Variables: ### -include ../../../src/makeprog.env +CUBE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) -@IF_GNU_MAKE@-include $(DEPFILES) \ No newline at end of file +### Conditionally set variables: ### + +@COND_DEPS_TRACKING_0@CXXC = $(CXX) +@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_TOOLKIT_MAC@WXBASEPORT = _carbon +@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_UNICODE_1@WXUNICODEFLAG = u +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o cube$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@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_PLATFORM_MAC_1@__cube___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@__cube___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C cube$(EXEEXT) +@COND_PLATFORM_WIN32_1@__cube___win32rc = cube_cube_rc.o + +### Targets: ### + +all: cube$(EXEEXT) + +clean: + rm -rf ./.deps + rm -f -f ./*.o + rm -f cube$(EXEEXT) + +cube$(EXEEXT): cube_cube.o $(__cube___win32rc) + $(CXX) -o $@ cube_cube.o $(__cube___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(__cube___mac_rezcmd) + $(__cube___mac_setfilecmd) + +cube_cube.o: $(srcdir)/cube.cpp + $(CXXC) -c -o $@ $(CUBE_CXXFLAGS) $< + +cube_cube_rc.o: $(srcdir)/cube.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) + +distclean: clean + rm -f configure config.cache config.log config.status + rm -f bk-deps shared-ld-sh + +install: all + +install-strip: install + +uninstall: + + +# Include dependency info, if present: +@IF_GNU_MAKE@-include .deps/*.d + +.PHONY: all clean distclean install uninstall diff --git a/samples/opengl/cube/makefile.bcc b/samples/opengl/cube/makefile.bcc index b46274d17e..f3a9caa176 100644 --- a/samples/opengl/cube/makefile.bcc +++ b/samples/opengl/cube/makefile.bcc @@ -1,21 +1,135 @@ -# -# File: makefile.bcc -# Author: Julian Smart -# Created: 1998 -# Updated: -# -# Builds a BC++ 16-bit sample +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= -!if "$(WXWIN)" == "" -!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. !endif -WXDIR = $(WXWIN) +!include ../../../build/config.bcc -TARGET=cube -#EXTRALIBS=$(WXDIR)\lib\glcanvas.lib -#EXTRACPPFLAGS=-I$(WXDIR)\utils\glcanvas\win -OBJECTS = $(TARGET).obj +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- -!include $(WXDIR)\src\makeprog.bcc +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +CUBE_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ + -I.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ + -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\cube.exe + +$(OBJS)\cube_cube.obj: .\cube.cpp + $(CXX) -q -c -P -o$@ $(CUBE_CXXFLAGS) $** + +$(OBJS)\cube_cube.res: .\cube.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib -i.\..\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe +$(OBJS)\cube.exe: $(OBJS)\cube_cube.obj $(OBJS)\cube_cube.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\cube_cube.obj,$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\cube_cube.res +| diff --git a/samples/opengl/cube/makefile.gcc b/samples/opengl/cube/makefile.gcc new file mode 100644 index 0000000000..085c3e2105 --- /dev/null +++ b/samples/opengl/cube/makefile.gcc @@ -0,0 +1,109 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +CUBE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p_1 = --define __WXDEBUG__ +endif +ifeq ($(SHARED),1) +__DLLFLAG_p = -DWXUSINGDLL +endif +ifeq ($(SHARED),1) +__DLLFLAG_p_1 = --define WXUSINGDLL +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\cube.exe + +$(OBJS)\cube_cube.o: .\cube.cpp + $(CXX) -c -o $@ $(CUBE_CXXFLAGS) $< + +$(OBJS)\cube_cube_rc.o: .\cube.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir ./../../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib --include-dir ./../../../src/regex --include-dir . $(__DLLFLAG_p_1) + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe + +$(OBJS)\cube.exe: $(OBJS)\cube_cube.o $(OBJS)\cube_cube_rc.o + $(CXX) -o $@ $(OBJS)\cube_cube.o $(OBJS)\cube_cube_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + +.PHONY: all clean diff --git a/samples/opengl/cube/makefile.vc b/samples/opengl/cube/makefile.vc index c761a91325..3bc0a18775 100644 --- a/samples/opengl/cube/makefile.vc +++ b/samples/opengl/cube/makefile.vc @@ -1,26 +1,125 @@ -# -# File: makefile.vc -# Author: Julian Smart -# Created: 1999 -# Updated: -# Copyright: (c) Julian Smart -# -# Makefile : Builds sample (VC++, WIN32) -# Use FINAL=1 argument to nmake to build final version with no debug info. +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= -# Set WXDIR for your system -WXDIR = $(WXWIN) +!include <../../../build/config.vc> -!if "$(FINAL)" == "1" -!else -LIBEXT=_d +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +CUBE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\cube.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = /d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL !endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\cube.exe + +$(OBJS)\cube_cube.obj: .\cube.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CUBE_CXXFLAGS) $** -PROGRAM=cube -OBJECTS = $(PROGRAM).obj -#EXTRAINC=-I..\..\win -#EXTRALIBS=$(WXDIR)\lib\glcanvas$(LIBEXT).lib glu32.lib opengl32.lib -EXTRALIBS=glu32.lib opengl32.lib +$(OBJS)\cube_cube.res: .\cube.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\..\include /i.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\..\src\tiff /i.\..\..\..\src\jpeg /i.\..\..\..\src\png /i.\..\..\..\src\zlib /i.\..\..\..\src\regex /i. $(__DLLFLAG_p_1) $** -!include $(WXDIR)\src\makeprog.vc +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe +$(OBJS)\cube.exe: $(OBJS)\cube_cube.obj $(OBJS)\cube_cube.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\cube_cube.obj $(OBJS)\cube_cube.res wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib +<< diff --git a/samples/opengl/cube/makefile.wat b/samples/opengl/cube/makefile.wat index 66cb0511c1..332f9bdabc 100644 --- a/samples/opengl/cube/makefile.wat +++ b/samples/opengl/cube/makefile.wat @@ -1,17 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= -WXDIR = $(%WXWIN) +!include ../../../build/config.wat -PROGRAM = cube -OBJECTS = $(PROGRAM).obj -#EXTRALIBS=$(WXDIR)\lib\glcanvas.lib -#EXTRACPPFLAGS=-I$(WXDIR)\utils\glcanvas\win +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- -!include $(WXDIR)\src\makeprog.wat +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +CUBE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\cube.exe + +$(OBJS)\cube_cube.obj : .AUTODEPEND .\cube.cpp + $(CXX) -zq -fo=$^@ $(CUBE_CXXFLAGS) $< + +$(OBJS)\cube_cube.res : .AUTODEPEND .\cube.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe + +$(OBJS)\cube.exe : $(OBJS)\cube_cube.obj $(OBJS)\cube_cube.res + @%create $(OBJS)\cube.lbc + @%append $(OBJS)\cube.lbc option quiet + @%append $(OBJS)\cube.lbc name $^@ + @%append $(OBJS)\cube.lbc option incremental + @%append $(OBJS)\cube.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\cube_cube.obj) do @%append $(OBJS)\cube.lbc file %i + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\cube.lbc diff --git a/samples/opengl/makefile.bcc b/samples/opengl/makefile.bcc new file mode 100644 index 0000000000..50aa237fb0 --- /dev/null +++ b/samples/opengl/makefile.bcc @@ -0,0 +1,37 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + + +### Conditionally set variables: ### + + + +### Targets: ### + +all: cube + +clean: + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + +cube: + (cd cube && $(MAKE) all) diff --git a/samples/opengl/makefile.gcc b/samples/opengl/makefile.gcc index f1dd627a18..a9dc8399f2 100644 --- a/samples/opengl/makefile.gcc +++ b/samples/opengl/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,87 +12,19 @@ WXUNIV = 0 ### Variables: ### -OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OPENGL_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### -ifeq ($(USE_GUI),0) -PORTNAME = base -endif -ifeq ($(USE_GUI),1) -PORTNAME = msw -endif -ifeq ($(BUILD),debug) -WXDEBUGFLAG = d -endif -ifeq ($(SHARED),1) -WXDLLFLAG = dll -endif -ifeq ($(UNICODE),1) -WXUNICODEFLAG = u -endif -ifeq ($(WXUNIV),1) -WXUNIVNAME = univ -endif -ifeq ($(BUILD),debug) -__DEBUG_DEFINE_p = -D__WXDEBUG__ -endif -ifeq ($(BUILD),debug) -__DEBUG_DEFINE_p_1 = --define __WXDEBUG__ -endif -ifeq ($(SHARED),1) -__DLLFLAG_p = -DWXUSINGDLL -endif -ifeq ($(SHARED),1) -__DLLFLAG_p_1 = --define WXUSINGDLL -endif -ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 -endif -ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1 -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core -endif -ifeq ($(MONOLITHIC),1) -__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) -endif -ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -endif -ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ -endif -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - ### Targets: ### -all: $(OBJS)\opengl.exe - -$(OBJS)\opengl_opengl.o: .\opengl.cpp - $(CXX) -c -o $@ $(OPENGL_CXXFLAGS) $< - -$(OBJS)\opengl_opengl_rc.o: .\opengl.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir ./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib --include-dir ./../../src/regex --include-dir . $(__DLLFLAG_p_1) +all: cube clean: - -if exist $(OBJS)\*.o del $(OBJS)\*.o - -if exist $(OBJS)\opengl.exe del $(OBJS)\opengl.exe - -install: all - -$(OBJS)\opengl.exe: $(OBJS)\opengl_opengl.o $(OBJS)\opengl_opengl_rc.o - $(CXX) -o $@ $(OBJS)\opengl_opengl.o $(OBJS)\opengl_opengl_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + -if exist .\*.o del .\*.o -uninstall: +cube: + (cd cube && $(MAKE) all) -.PHONY: all +.PHONY: all clean cube diff --git a/samples/opengl/makefile.vc b/samples/opengl/makefile.vc new file mode 100644 index 0000000000..c8861af3b2 --- /dev/null +++ b/samples/opengl/makefile.vc @@ -0,0 +1,31 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + + +### Conditionally set variables: ### + + + +### Targets: ### + +all: cube + +clean: + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + +cube: + cd cube + $(MAKE) /$(MAKEFLAGS) all + cd $(MAKEDIR) diff --git a/samples/opengl/makefile.wat b/samples/opengl/makefile.wat new file mode 100644 index 0000000000..c7de1c1f7e --- /dev/null +++ b/samples/opengl/makefile.wat @@ -0,0 +1,49 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + + +### Variables: ### + + + + +### Targets: ### + +all : .SYMBOLIC cube + +clean : .SYMBOLIC + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + -if exist .\*.lbc del .\*.lbc + -if exist .\*.ilk del .\*.ilk + +cube : .SYMBOLIC + cd cube + wmake $(__MAKEOPTS__) all + cd $(WATCOM_CWD) diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in index f531fd2ff8..f634eaa10a 100644 --- a/samples/ownerdrw/Makefile.in +++ b/samples/ownerdrw/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -OWNERDRW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +OWNERDRW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ OWNERDRW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o ownerdrw$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o ownerdrw$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__ownerdrw___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__ownerdrw___mac_setfilecmd = $(SETFILE) -a C ownerdrw$(EXEEXT) +@COND_PLATFORM_MAC_1@__ownerdrw___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C ownerdrw$(EXEEXT) @COND_PLATFORM_WIN32_1@__ownerdrw___win32rc = ownerdrw_ownerdrw_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install ownerdrw$(EXEEXT): ownerdrw_ownerdrw.o $(__ownerdrw___win32rc) - $(CXX) -o $@ ownerdrw_ownerdrw.o $(__ownerdrw___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ ownerdrw_ownerdrw.o $(__ownerdrw___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__ownerdrw___mac_rezcmd) $(__ownerdrw___mac_setfilecmd) diff --git a/samples/ownerdrw/makefile.bcc b/samples/ownerdrw/makefile.bcc index 15075356fb..d05e54c8ce 100644 --- a/samples/ownerdrw/makefile.bcc +++ b/samples/ownerdrw/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OWNERDRW_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OWNERDRW_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\ownerdrw_ownerdrw.obj: .\ownerdrw.cpp $(CXX) -q -c -P -o$@ $(OWNERDRW_CXXFLAGS) $** $(OBJS)\ownerdrw_ownerdrw.res: .\ownerdrw.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\ownerdrw.exe del $(OBJS)\ownerdrw.exe -install: all - $(OBJS)\ownerdrw.exe: $(OBJS)\ownerdrw_ownerdrw.obj $(OBJS)\ownerdrw_ownerdrw.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\ownerdrw_ownerdrw.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\ownerdrw_ownerdrw.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\ownerdrw_ownerdrw.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\ownerdrw_ownerdrw.res | - -uninstall: diff --git a/samples/ownerdrw/makefile.gcc b/samples/ownerdrw/makefile.gcc index 0f1a93a2b0..5185b7a217 100644 --- a/samples/ownerdrw/makefile.gcc +++ b/samples/ownerdrw/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -48,10 +13,13 @@ WXUNIV = 0 ### Variables: ### OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OWNERDRW_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OWNERDRW_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\ownerdrw.exe del $(OBJS)\ownerdrw.exe -install: all - $(OBJS)\ownerdrw.exe: $(OBJS)\ownerdrw_ownerdrw.o $(OBJS)\ownerdrw_ownerdrw_rc.o - $(CXX) -o $@ $(OBJS)\ownerdrw_ownerdrw.o $(OBJS)\ownerdrw_ownerdrw_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\ownerdrw_ownerdrw.o $(OBJS)\ownerdrw_ownerdrw_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/ownerdrw/makefile.vc b/samples/ownerdrw/makefile.vc index 044869bbdb..576c383d82 100644 --- a/samples/ownerdrw/makefile.vc +++ b/samples/ownerdrw/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -43,7 +13,7 @@ WXUNIV = 0 ### Variables: ### OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OWNERDRW_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +OWNERDRW_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\ownerdrw.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\ownerdrw_ownerdrw.obj: .\ownerdrw.cpp $(CXX) /c /nologo /TP /Fo$@ $(OWNERDRW_CXXFLAGS) $** $(OBJS)\ownerdrw_ownerdrw.res: .\ownerdrw.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\ownerdrw.exe del $(OBJS)\ownerdrw.exe -install: all - $(OBJS)\ownerdrw.exe: $(OBJS)\ownerdrw_ownerdrw.obj $(OBJS)\ownerdrw_ownerdrw.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\ownerdrw_ownerdrw.obj $(OBJS)\ownerdrw_ownerdrw.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\ownerdrw_ownerdrw.obj $(OBJS)\ownerdrw_ownerdrw.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/ownerdrw/makefile.wat b/samples/ownerdrw/makefile.wat index fa123061ef..aa18595652 100644 --- a/samples/ownerdrw/makefile.wat +++ b/samples/ownerdrw/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = ownerdrw -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OWNERDRW_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\ownerdrw.exe + +$(OBJS)\ownerdrw_ownerdrw.obj : .AUTODEPEND .\ownerdrw.cpp + $(CXX) -zq -fo=$^@ $(OWNERDRW_CXXFLAGS) $< + +$(OBJS)\ownerdrw_ownerdrw.res : .AUTODEPEND .\ownerdrw.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\ownerdrw.exe del $(OBJS)\ownerdrw.exe + +$(OBJS)\ownerdrw.exe : $(OBJS)\ownerdrw_ownerdrw.obj $(OBJS)\ownerdrw_ownerdrw.res + @%create $(OBJS)\ownerdrw.lbc + @%append $(OBJS)\ownerdrw.lbc option quiet + @%append $(OBJS)\ownerdrw.lbc name $^@ + @%append $(OBJS)\ownerdrw.lbc option incremental + @%append $(OBJS)\ownerdrw.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\ownerdrw_ownerdrw.obj) do @%append $(OBJS)\ownerdrw.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\ownerdrw.lbc diff --git a/samples/png/Makefile.in b/samples/png/Makefile.in index 8ea232deae..0c68127d5f 100644 --- a/samples/png/Makefile.in +++ b/samples/png/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -PNG_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +PNG_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,38 +52,59 @@ PNG_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_s @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o png$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o png$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__png___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) @COND_PLATFORM_MAC_1@__png___mac_setfilecmd = $(SETFILE) -a C png$(EXEEXT) -@COND_PLATFORM_WIN32_1@__png___win32rc = png_png_rc.o +@COND_PLATFORM_WIN32_1@__png___win32rc = png_pngdemo_rc.o ### Targets: ### @@ -97,15 +123,15 @@ install: all install-strip: install -png$(EXEEXT): png_png.o $(__png___win32rc) - $(CXX) -o $@ png_png.o $(__png___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) +png$(EXEEXT): png_pngdemo.o $(__png___win32rc) + $(CXX) -o $@ png_pngdemo.o $(__png___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__png___mac_rezcmd) $(__png___mac_setfilecmd) -png_png.o: $(srcdir)/png.cpp +png_pngdemo.o: $(srcdir)/pngdemo.cpp $(CXXC) -c -o $@ $(PNG_CXXFLAGS) $< -png_png_rc.o: $(srcdir)/png.rc +png_pngdemo_rc.o: $(srcdir)/pngdemo.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) uninstall: diff --git a/samples/png/makefile.bcc b/samples/png/makefile.bcc index d5b15ed672..c076cec7b9 100644 --- a/samples/png/makefile.bcc +++ b/samples/png/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PNG_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +PNG_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -139,22 +118,18 @@ $(OBJS): all: $(OBJS)\png.exe -$(OBJS)\png_png.obj: .\png.cpp +$(OBJS)\png_pngdemo.obj: .\pngdemo.cpp $(CXX) -q -c -P -o$@ $(PNG_CXXFLAGS) $** -$(OBJS)\png_png.res: .\png.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** +$(OBJS)\png_pngdemo.res: .\pngdemo.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\png.exe del $(OBJS)\png.exe -install: all - -$(OBJS)\png.exe: $(OBJS)\png_png.obj $(OBJS)\png_png.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\png_png.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\png_png.res +$(OBJS)\png.exe: $(OBJS)\png_pngdemo.obj $(OBJS)\png_pngdemo.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\png_pngdemo.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\png_pngdemo.res | - -uninstall: diff --git a/samples/png/makefile.gcc b/samples/png/makefile.gcc index c209381b70..a17bb997bd 100644 --- a/samples/png/makefile.gcc +++ b/samples/png/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -48,10 +13,13 @@ WXUNIV = 0 ### Variables: ### OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PNG_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +PNG_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -113,21 +93,17 @@ $(OBJS): all: $(OBJS)\png.exe -$(OBJS)\png_png.o: .\png.cpp +$(OBJS)\png_pngdemo.o: .\pngdemo.cpp $(CXX) -c -o $@ $(PNG_CXXFLAGS) $< -$(OBJS)\png_png_rc.o: .\png.rc +$(OBJS)\png_pngdemo_rc.o: .\pngdemo.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir ./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib --include-dir ./../../src/regex --include-dir . $(__DLLFLAG_p_1) clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\png.exe del $(OBJS)\png.exe -install: all - -$(OBJS)\png.exe: $(OBJS)\png_png.o $(OBJS)\png_png_rc.o - $(CXX) -o $@ $(OBJS)\png_png.o $(OBJS)\png_png_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: +$(OBJS)\png.exe: $(OBJS)\png_pngdemo.o $(OBJS)\png_pngdemo_rc.o + $(CXX) -o $@ $(OBJS)\png_pngdemo.o $(OBJS)\png_pngdemo_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/png/makefile.vc b/samples/png/makefile.vc index 74026d31a0..bf3cdde2c6 100644 --- a/samples/png/makefile.vc +++ b/samples/png/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -43,7 +13,7 @@ WXUNIV = 0 ### Variables: ### OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PNG_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +PNG_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\png.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -108,22 +108,18 @@ $(OBJS): all: $(OBJS)\png.exe -$(OBJS)\png_png.obj: .\png.cpp +$(OBJS)\png_pngdemo.obj: .\pngdemo.cpp $(CXX) /c /nologo /TP /Fo$@ $(PNG_CXXFLAGS) $** -$(OBJS)\png_png.res: .\png.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** +$(OBJS)\png_pngdemo.res: .\pngdemo.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\png.exe del $(OBJS)\png.exe -install: all - -$(OBJS)\png.exe: $(OBJS)\png_png.obj $(OBJS)\png_png.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\png_png.obj $(OBJS)\png_png.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib +$(OBJS)\png.exe: $(OBJS)\png_pngdemo.obj $(OBJS)\png_pngdemo.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\png_pngdemo.obj $(OBJS)\png_pngdemo.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/png/makefile.wat b/samples/png/makefile.wat index eb51d37467..d9372e79c9 100644 --- a/samples/png/makefile.wat +++ b/samples/png/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = pngdemo -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +PNG_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\png.exe + +$(OBJS)\png_pngdemo.obj : .AUTODEPEND .\pngdemo.cpp + $(CXX) -zq -fo=$^@ $(PNG_CXXFLAGS) $< + +$(OBJS)\png_pngdemo.res : .AUTODEPEND .\pngdemo.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\png.exe del $(OBJS)\png.exe + +$(OBJS)\png.exe : $(OBJS)\png_pngdemo.obj $(OBJS)\png_pngdemo.res + @%create $(OBJS)\png.lbc + @%append $(OBJS)\png.lbc option quiet + @%append $(OBJS)\png.lbc name $^@ + @%append $(OBJS)\png.lbc option incremental + @%append $(OBJS)\png.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\png_pngdemo.obj) do @%append $(OBJS)\png.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\png.lbc library %i + @%append $(OBJS)\png.lbc option resource=$(OBJS)\png_pngdemo.res + wlink @$(OBJS)\png.lbc diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in index 1a12f0890e..9eaf4a8377 100644 --- a/samples/printing/Makefile.in +++ b/samples/printing/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -PRINTING_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +PRINTING_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ PRINTING_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o printing$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o printing$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__printing___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__printing___mac_setfilecmd = $(SETFILE) -a C printing$(EXEEXT) +@COND_PLATFORM_MAC_1@__printing___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C printing$(EXEEXT) @COND_PLATFORM_WIN32_1@__printing___win32rc = printing_printing_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install printing$(EXEEXT): printing_printing.o $(__printing___win32rc) - $(CXX) -o $@ printing_printing.o $(__printing___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ printing_printing.o $(__printing___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__printing___mac_rezcmd) $(__printing___mac_setfilecmd) diff --git a/samples/printing/makefile.bcc b/samples/printing/makefile.bcc index 6dad2e23de..662a0a6f40 100644 --- a/samples/printing/makefile.bcc +++ b/samples/printing/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PRINTING_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +PRINTING_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\printing_printing.obj: .\printing.cpp $(CXX) -q -c -P -o$@ $(PRINTING_CXXFLAGS) $** $(OBJS)\printing_printing.res: .\printing.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe -install: all - $(OBJS)\printing.exe: $(OBJS)\printing_printing.obj $(OBJS)\printing_printing.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\printing_printing.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\printing_printing.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\printing_printing.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\printing_printing.res | - -uninstall: diff --git a/samples/printing/makefile.gcc b/samples/printing/makefile.gcc index d90902df21..00d9ae0fef 100644 --- a/samples/printing/makefile.gcc +++ b/samples/printing/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -48,10 +13,13 @@ WXUNIV = 0 ### Variables: ### OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PRINTING_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +PRINTING_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe -install: all - $(OBJS)\printing.exe: $(OBJS)\printing_printing.o $(OBJS)\printing_printing_rc.o - $(CXX) -o $@ $(OBJS)\printing_printing.o $(OBJS)\printing_printing_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\printing_printing.o $(OBJS)\printing_printing_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/printing/makefile.vc b/samples/printing/makefile.vc index 50d7cc2baf..d5dc439ea9 100644 --- a/samples/printing/makefile.vc +++ b/samples/printing/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -43,7 +13,7 @@ WXUNIV = 0 ### Variables: ### OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PRINTING_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +PRINTING_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\printing.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\printing_printing.obj: .\printing.cpp $(CXX) /c /nologo /TP /Fo$@ $(PRINTING_CXXFLAGS) $** $(OBJS)\printing_printing.res: .\printing.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe -install: all - $(OBJS)\printing.exe: $(OBJS)\printing_printing.obj $(OBJS)\printing_printing.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\printing_printing.obj $(OBJS)\printing_printing.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\printing_printing.obj $(OBJS)\printing_printing.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/printing/makefile.wat b/samples/printing/makefile.wat index f1d9dfa721..e2d8e43d9a 100644 --- a/samples/printing/makefile.wat +++ b/samples/printing/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = printing -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +PRINTING_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\printing.exe + +$(OBJS)\printing_printing.obj : .AUTODEPEND .\printing.cpp + $(CXX) -zq -fo=$^@ $(PRINTING_CXXFLAGS) $< + +$(OBJS)\printing_printing.res : .AUTODEPEND .\printing.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe + +$(OBJS)\printing.exe : $(OBJS)\printing_printing.obj $(OBJS)\printing_printing.res + @%create $(OBJS)\printing.lbc + @%append $(OBJS)\printing.lbc option quiet + @%append $(OBJS)\printing.lbc name $^@ + @%append $(OBJS)\printing.lbc option incremental + @%append $(OBJS)\printing.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\printing_printing.obj) do @%append $(OBJS)\printing.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\printing.lbc diff --git a/samples/propsize/Makefile.in b/samples/propsize/Makefile.in index b6749add32..0b30c9101f 100644 --- a/samples/propsize/Makefile.in +++ b/samples/propsize/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -PROPSIZE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +PROPSIZE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ PROPSIZE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o propsize$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o propsize$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__propsize___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__propsize___mac_setfilecmd = $(SETFILE) -a C propsize$(EXEEXT) +@COND_PLATFORM_MAC_1@__propsize___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C propsize$(EXEEXT) @COND_PLATFORM_WIN32_1@__propsize___win32rc = propsize_propsize_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install propsize$(EXEEXT): propsize_propsize.o $(__propsize___win32rc) - $(CXX) -o $@ propsize_propsize.o $(__propsize___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ propsize_propsize.o $(__propsize___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__propsize___mac_rezcmd) $(__propsize___mac_setfilecmd) diff --git a/samples/propsize/makefile.bcc b/samples/propsize/makefile.bcc index 812934c29f..74d6b15a41 100644 --- a/samples/propsize/makefile.bcc +++ b/samples/propsize/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PROPSIZE_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +PROPSIZE_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\propsize_propsize.obj: .\propsize.cpp $(CXX) -q -c -P -o$@ $(PROPSIZE_CXXFLAGS) $** $(OBJS)\propsize_propsize.res: .\propsize.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\propsize.exe del $(OBJS)\propsize.exe -install: all - $(OBJS)\propsize.exe: $(OBJS)\propsize_propsize.obj $(OBJS)\propsize_propsize.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\propsize_propsize.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\propsize_propsize.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\propsize_propsize.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\propsize_propsize.res | - -uninstall: diff --git a/samples/propsize/makefile.gcc b/samples/propsize/makefile.gcc index f42e8c90c8..04eda1213a 100644 --- a/samples/propsize/makefile.gcc +++ b/samples/propsize/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -48,10 +13,13 @@ WXUNIV = 0 ### Variables: ### OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PROPSIZE_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +PROPSIZE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\propsize.exe del $(OBJS)\propsize.exe -install: all - $(OBJS)\propsize.exe: $(OBJS)\propsize_propsize.o $(OBJS)\propsize_propsize_rc.o - $(CXX) -o $@ $(OBJS)\propsize_propsize.o $(OBJS)\propsize_propsize_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\propsize_propsize.o $(OBJS)\propsize_propsize_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/propsize/makefile.vc b/samples/propsize/makefile.vc index e12e2427fc..2e85d3ce1f 100644 --- a/samples/propsize/makefile.vc +++ b/samples/propsize/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -43,7 +13,7 @@ WXUNIV = 0 ### Variables: ### OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -PROPSIZE_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +PROPSIZE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\propsize.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\propsize_propsize.obj: .\propsize.cpp $(CXX) /c /nologo /TP /Fo$@ $(PROPSIZE_CXXFLAGS) $** $(OBJS)\propsize_propsize.res: .\propsize.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\propsize.exe del $(OBJS)\propsize.exe -install: all - $(OBJS)\propsize.exe: $(OBJS)\propsize_propsize.obj $(OBJS)\propsize_propsize.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\propsize_propsize.obj $(OBJS)\propsize_propsize.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\propsize_propsize.obj $(OBJS)\propsize_propsize.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/propsize/makefile.wat b/samples/propsize/makefile.wat index d54d2d6add..35681aee90 100644 --- a/samples/propsize/makefile.wat +++ b/samples/propsize/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = propsize -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +PROPSIZE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\propsize.exe + +$(OBJS)\propsize_propsize.obj : .AUTODEPEND .\propsize.cpp + $(CXX) -zq -fo=$^@ $(PROPSIZE_CXXFLAGS) $< + +$(OBJS)\propsize_propsize.res : .AUTODEPEND .\propsize.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\propsize.exe del $(OBJS)\propsize.exe + +$(OBJS)\propsize.exe : $(OBJS)\propsize_propsize.obj $(OBJS)\propsize_propsize.res + @%create $(OBJS)\propsize.lbc + @%append $(OBJS)\propsize.lbc option quiet + @%append $(OBJS)\propsize.lbc name $^@ + @%append $(OBJS)\propsize.lbc option incremental + @%append $(OBJS)\propsize.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\propsize_propsize.obj) do @%append $(OBJS)\propsize.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\propsize.lbc library %i + @%append $(OBJS)\propsize.lbc option resource=$(OBJS)\propsize_propsize.res + wlink @$(OBJS)\propsize.lbc diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in index 13e6a55cf8..29cc84dea2 100644 --- a/samples/regtest/Makefile.in +++ b/samples/regtest/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -REGTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +REGTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ REGTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o regtest$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o regtest$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__regtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__regtest___mac_setfilecmd = $(SETFILE) -a C regtest$(EXEEXT) +@COND_PLATFORM_MAC_1@__regtest___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C regtest$(EXEEXT) @COND_PLATFORM_WIN32_1@__regtest___win32rc = regtest_regtest_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install regtest$(EXEEXT): regtest_regtest.o $(__regtest___win32rc) - $(CXX) -o $@ regtest_regtest.o $(__regtest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ regtest_regtest.o $(__regtest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__regtest___mac_rezcmd) $(__regtest___mac_setfilecmd) diff --git a/samples/regtest/makefile.bcc b/samples/regtest/makefile.bcc new file mode 100644 index 0000000000..ba9d404538 --- /dev/null +++ b/samples/regtest/makefile.bcc @@ -0,0 +1,135 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +REGTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\regtest.exe + +$(OBJS)\regtest_regtest.obj: .\regtest.cpp + $(CXX) -q -c -P -o$@ $(REGTEST_CXXFLAGS) $** + +$(OBJS)\regtest_regtest.res: .\regtest.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\regtest.exe del $(OBJS)\regtest.exe + +$(OBJS)\regtest.exe: $(OBJS)\regtest_regtest.obj $(OBJS)\regtest_regtest.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\regtest_regtest.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\regtest_regtest.res +| diff --git a/samples/regtest/makefile.gcc b/samples/regtest/makefile.gcc index 01e29c4d30..1135f864f5 100644 --- a/samples/regtest/makefile.gcc +++ b/samples/regtest/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -48,10 +13,13 @@ WXUNIV = 0 ### Variables: ### OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -REGTEST_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +REGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\regtest.exe del $(OBJS)\regtest.exe -install: all - $(OBJS)\regtest.exe: $(OBJS)\regtest_regtest.o $(OBJS)\regtest_regtest_rc.o - $(CXX) -o $@ $(OBJS)\regtest_regtest.o $(OBJS)\regtest_regtest_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\regtest_regtest.o $(OBJS)\regtest_regtest_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/regtest/makefile.vc b/samples/regtest/makefile.vc index 874c0a0988..d22a6a9c26 100644 --- a/samples/regtest/makefile.vc +++ b/samples/regtest/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -43,7 +13,7 @@ WXUNIV = 0 ### Variables: ### OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -REGTEST_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +REGTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\regtest.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\regtest_regtest.obj: .\regtest.cpp $(CXX) /c /nologo /TP /Fo$@ $(REGTEST_CXXFLAGS) $** $(OBJS)\regtest_regtest.res: .\regtest.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\regtest.exe del $(OBJS)\regtest.exe -install: all - $(OBJS)\regtest.exe: $(OBJS)\regtest_regtest.obj $(OBJS)\regtest_regtest.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\regtest_regtest.obj $(OBJS)\regtest_regtest.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\regtest_regtest.obj $(OBJS)\regtest_regtest.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/regtest/makefile.wat b/samples/regtest/makefile.wat index b4d5521d7d..a916a5f6ce 100644 --- a/samples/regtest/makefile.wat +++ b/samples/regtest/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = regtest -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +REGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\regtest.exe + +$(OBJS)\regtest_regtest.obj : .AUTODEPEND .\regtest.cpp + $(CXX) -zq -fo=$^@ $(REGTEST_CXXFLAGS) $< + +$(OBJS)\regtest_regtest.res : .AUTODEPEND .\regtest.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\regtest.exe del $(OBJS)\regtest.exe + +$(OBJS)\regtest.exe : $(OBJS)\regtest_regtest.obj $(OBJS)\regtest_regtest.res + @%create $(OBJS)\regtest.lbc + @%append $(OBJS)\regtest.lbc option quiet + @%append $(OBJS)\regtest.lbc name $^@ + @%append $(OBJS)\regtest.lbc option incremental + @%append $(OBJS)\regtest.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\regtest_regtest.obj) do @%append $(OBJS)\regtest.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\regtest.lbc diff --git a/samples/richedit/Makefile.in b/samples/richedit/Makefile.in index c4e0506403..0874c463a1 100644 --- a/samples/richedit/Makefile.in +++ b/samples/richedit/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -RICHEDIT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +RICHEDIT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ RICHEDIT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o richedit$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o richedit$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__richedit___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__richedit___mac_setfilecmd = $(SETFILE) -a C richedit$(EXEEXT) +@COND_PLATFORM_MAC_1@__richedit___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C richedit$(EXEEXT) @COND_PLATFORM_WIN32_1@__richedit___win32rc = richedit_richedit_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install richedit$(EXEEXT): richedit_richedit.o $(__richedit___win32rc) - $(CXX) -o $@ richedit_richedit.o $(__richedit___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ richedit_richedit.o $(__richedit___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__richedit___mac_rezcmd) $(__richedit___mac_setfilecmd) diff --git a/samples/richedit/makefile.bcc b/samples/richedit/makefile.bcc new file mode 100644 index 0000000000..c24917ce37 --- /dev/null +++ b/samples/richedit/makefile.bcc @@ -0,0 +1,135 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +RICHEDIT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\richedit.exe + +$(OBJS)\richedit_richedit.obj: .\richedit.cpp + $(CXX) -q -c -P -o$@ $(RICHEDIT_CXXFLAGS) $** + +$(OBJS)\richedit_richedit.res: .\richedit.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\richedit.exe del $(OBJS)\richedit.exe + +$(OBJS)\richedit.exe: $(OBJS)\richedit_richedit.obj $(OBJS)\richedit_richedit.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\richedit_richedit.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\richedit_richedit.res +| diff --git a/samples/richedit/makefile.gcc b/samples/richedit/makefile.gcc index 53bd279ccb..272e608258 100644 --- a/samples/richedit/makefile.gcc +++ b/samples/richedit/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -48,10 +13,13 @@ WXUNIV = 0 ### Variables: ### OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -RICHEDIT_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +RICHEDIT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\richedit.exe del $(OBJS)\richedit.exe -install: all - $(OBJS)\richedit.exe: $(OBJS)\richedit_richedit.o $(OBJS)\richedit_richedit_rc.o - $(CXX) -o $@ $(OBJS)\richedit_richedit.o $(OBJS)\richedit_richedit_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\richedit_richedit.o $(OBJS)\richedit_richedit_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/richedit/makefile.vc b/samples/richedit/makefile.vc index 2b4ba57907..1662040d4a 100644 --- a/samples/richedit/makefile.vc +++ b/samples/richedit/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -43,7 +13,7 @@ WXUNIV = 0 ### Variables: ### OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -RICHEDIT_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +RICHEDIT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\richedit.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\richedit_richedit.obj: .\richedit.cpp $(CXX) /c /nologo /TP /Fo$@ $(RICHEDIT_CXXFLAGS) $** $(OBJS)\richedit_richedit.res: .\richedit.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\richedit.exe del $(OBJS)\richedit.exe -install: all - $(OBJS)\richedit.exe: $(OBJS)\richedit_richedit.obj $(OBJS)\richedit_richedit.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\richedit_richedit.obj $(OBJS)\richedit_richedit.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\richedit_richedit.obj $(OBJS)\richedit_richedit.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/richedit/makefile.wat b/samples/richedit/makefile.wat new file mode 100644 index 0000000000..d649a5a09a --- /dev/null +++ b/samples/richedit/makefile.wat @@ -0,0 +1,147 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +RICHEDIT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\richedit.exe + +$(OBJS)\richedit_richedit.obj : .AUTODEPEND .\richedit.cpp + $(CXX) -zq -fo=$^@ $(RICHEDIT_CXXFLAGS) $< + +$(OBJS)\richedit_richedit.res : .AUTODEPEND .\richedit.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\richedit.exe del $(OBJS)\richedit.exe + +$(OBJS)\richedit.exe : $(OBJS)\richedit_richedit.obj $(OBJS)\richedit_richedit.res + @%create $(OBJS)\richedit.lbc + @%append $(OBJS)\richedit.lbc option quiet + @%append $(OBJS)\richedit.lbc name $^@ + @%append $(OBJS)\richedit.lbc option incremental + @%append $(OBJS)\richedit.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\richedit_richedit.obj) do @%append $(OBJS)\richedit.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\richedit.lbc library %i + @%append $(OBJS)\richedit.lbc option resource=$(OBJS)\richedit_richedit.res + wlink @$(OBJS)\richedit.lbc diff --git a/samples/rotate/Makefile.in b/samples/rotate/Makefile.in index 00c8b75002..caae25247a 100644 --- a/samples/rotate/Makefile.in +++ b/samples/rotate/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -ROTATE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +ROTATE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ ROTATE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(to @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o rotate$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o rotate$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__rotate___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__rotate___mac_setfilecmd = $(SETFILE) -a C rotate$(EXEEXT) +@COND_PLATFORM_MAC_1@__rotate___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C rotate$(EXEEXT) @COND_PLATFORM_WIN32_1@__rotate___win32rc = rotate_rotate_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install rotate$(EXEEXT): rotate_rotate.o $(__rotate___win32rc) - $(CXX) -o $@ rotate_rotate.o $(__rotate___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ rotate_rotate.o $(__rotate___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__rotate___mac_rezcmd) $(__rotate___mac_setfilecmd) diff --git a/samples/rotate/makefile.bcc b/samples/rotate/makefile.bcc new file mode 100644 index 0000000000..863000eab2 --- /dev/null +++ b/samples/rotate/makefile.bcc @@ -0,0 +1,135 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +ROTATE_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\rotate.exe + +$(OBJS)\rotate_rotate.obj: .\rotate.cpp + $(CXX) -q -c -P -o$@ $(ROTATE_CXXFLAGS) $** + +$(OBJS)\rotate_rotate.res: .\rotate.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\rotate.exe del $(OBJS)\rotate.exe + +$(OBJS)\rotate.exe: $(OBJS)\rotate_rotate.obj $(OBJS)\rotate_rotate.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\rotate_rotate.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\rotate_rotate.res +| diff --git a/samples/rotate/makefile.gcc b/samples/rotate/makefile.gcc index d7cbcb7c50..15e4e0f880 100644 --- a/samples/rotate/makefile.gcc +++ b/samples/rotate/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -48,10 +13,13 @@ WXUNIV = 0 ### Variables: ### OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -ROTATE_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +ROTATE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\rotate.exe del $(OBJS)\rotate.exe -install: all - $(OBJS)\rotate.exe: $(OBJS)\rotate_rotate.o $(OBJS)\rotate_rotate_rc.o - $(CXX) -o $@ $(OBJS)\rotate_rotate.o $(OBJS)\rotate_rotate_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\rotate_rotate.o $(OBJS)\rotate_rotate_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/rotate/makefile.vc b/samples/rotate/makefile.vc index 5d2a7d2e49..30b8705678 100644 --- a/samples/rotate/makefile.vc +++ b/samples/rotate/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -43,7 +13,7 @@ WXUNIV = 0 ### Variables: ### OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -ROTATE_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +ROTATE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\rotate.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\rotate_rotate.obj: .\rotate.cpp $(CXX) /c /nologo /TP /Fo$@ $(ROTATE_CXXFLAGS) $** $(OBJS)\rotate_rotate.res: .\rotate.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\rotate.exe del $(OBJS)\rotate.exe -install: all - $(OBJS)\rotate.exe: $(OBJS)\rotate_rotate.obj $(OBJS)\rotate_rotate.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\rotate_rotate.obj $(OBJS)\rotate_rotate.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\rotate_rotate.obj $(OBJS)\rotate_rotate.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/rotate/makefile.wat b/samples/rotate/makefile.wat index 079252b2e5..617f7e7ac7 100644 --- a/samples/rotate/makefile.wat +++ b/samples/rotate/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = rotate -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +ROTATE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\rotate.exe + +$(OBJS)\rotate_rotate.obj : .AUTODEPEND .\rotate.cpp + $(CXX) -zq -fo=$^@ $(ROTATE_CXXFLAGS) $< + +$(OBJS)\rotate_rotate.res : .AUTODEPEND .\rotate.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\rotate.exe del $(OBJS)\rotate.exe + +$(OBJS)\rotate.exe : $(OBJS)\rotate_rotate.obj $(OBJS)\rotate_rotate.res + @%create $(OBJS)\rotate.lbc + @%append $(OBJS)\rotate.lbc option quiet + @%append $(OBJS)\rotate.lbc name $^@ + @%append $(OBJS)\rotate.lbc option incremental + @%append $(OBJS)\rotate.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\rotate_rotate.obj) do @%append $(OBJS)\rotate.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\rotate.lbc library %i + @%append $(OBJS)\rotate.lbc option resource=$(OBJS)\rotate_rotate.res + wlink @$(OBJS)\rotate.lbc diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in index 8d8fa90586..3e7ae417d3 100644 --- a/samples/sashtest/Makefile.in +++ b/samples/sashtest/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -SASHTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +SASHTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ SASHTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o sashtest$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o sashtest$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__sashtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__sashtest___mac_setfilecmd = $(SETFILE) -a C sashtest$(EXEEXT) +@COND_PLATFORM_MAC_1@__sashtest___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C sashtest$(EXEEXT) @COND_PLATFORM_WIN32_1@__sashtest___win32rc = sashtest_sashtest_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install sashtest$(EXEEXT): sashtest_sashtest.o $(__sashtest___win32rc) - $(CXX) -o $@ sashtest_sashtest.o $(__sashtest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ sashtest_sashtest.o $(__sashtest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__sashtest___mac_rezcmd) $(__sashtest___mac_setfilecmd) diff --git a/samples/sashtest/makefile.bcc b/samples/sashtest/makefile.bcc index b4207f345a..ae123df2d1 100644 --- a/samples/sashtest/makefile.bcc +++ b/samples/sashtest/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -SASHTEST_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SASHTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\sashtest_sashtest.obj: .\sashtest.cpp $(CXX) -q -c -P -o$@ $(SASHTEST_CXXFLAGS) $** $(OBJS)\sashtest_sashtest.res: .\sashtest.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\sashtest.exe del $(OBJS)\sashtest.exe -install: all - $(OBJS)\sashtest.exe: $(OBJS)\sashtest_sashtest.obj $(OBJS)\sashtest_sashtest.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\sashtest_sashtest.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\sashtest_sashtest.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\sashtest_sashtest.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\sashtest_sashtest.res | - -uninstall: diff --git a/samples/sashtest/makefile.gcc b/samples/sashtest/makefile.gcc index e84f8959aa..b53ffe4dc4 100644 --- a/samples/sashtest/makefile.gcc +++ b/samples/sashtest/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### -SASHTEST_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SASHTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\sashtest.exe del $(OBJS)\sashtest.exe -install: all - $(OBJS)\sashtest.exe: $(OBJS)\sashtest_sashtest.o $(OBJS)\sashtest_sashtest_rc.o - $(CXX) -o $@ $(OBJS)\sashtest_sashtest.o $(OBJS)\sashtest_sashtest_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\sashtest_sashtest.o $(OBJS)\sashtest_sashtest_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/sashtest/makefile.vc b/samples/sashtest/makefile.vc index 3caba4d12f..e9dc29bebb 100644 --- a/samples/sashtest/makefile.vc +++ b/samples/sashtest/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### -SASHTEST_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SASHTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\sashtest.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\sashtest_sashtest.obj: .\sashtest.cpp $(CXX) /c /nologo /TP /Fo$@ $(SASHTEST_CXXFLAGS) $** $(OBJS)\sashtest_sashtest.res: .\sashtest.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\sashtest.exe del $(OBJS)\sashtest.exe -install: all - $(OBJS)\sashtest.exe: $(OBJS)\sashtest_sashtest.obj $(OBJS)\sashtest_sashtest.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\sashtest_sashtest.obj $(OBJS)\sashtest_sashtest.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\sashtest_sashtest.obj $(OBJS)\sashtest_sashtest.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/sashtest/makefile.wat b/samples/sashtest/makefile.wat index 3ee0cf2705..3f092ba2dc 100644 --- a/samples/sashtest/makefile.wat +++ b/samples/sashtest/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = sashtest -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SASHTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\sashtest.exe + +$(OBJS)\sashtest_sashtest.obj : .AUTODEPEND .\sashtest.cpp + $(CXX) -zq -fo=$^@ $(SASHTEST_CXXFLAGS) $< + +$(OBJS)\sashtest_sashtest.res : .AUTODEPEND .\sashtest.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\sashtest.exe del $(OBJS)\sashtest.exe + +$(OBJS)\sashtest.exe : $(OBJS)\sashtest_sashtest.obj $(OBJS)\sashtest_sashtest.res + @%create $(OBJS)\sashtest.lbc + @%append $(OBJS)\sashtest.lbc option quiet + @%append $(OBJS)\sashtest.lbc name $^@ + @%append $(OBJS)\sashtest.lbc option incremental + @%append $(OBJS)\sashtest.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\sashtest_sashtest.obj) do @%append $(OBJS)\sashtest.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\sashtest.lbc diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in index 98cded6bed..70cf70ee80 100644 --- a/samples/scroll/Makefile.in +++ b/samples/scroll/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -SCROLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +SCROLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ SCROLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(to @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o scroll$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o scroll$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__scroll___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__scroll___mac_setfilecmd = $(SETFILE) -a C scroll$(EXEEXT) +@COND_PLATFORM_MAC_1@__scroll___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C scroll$(EXEEXT) @COND_PLATFORM_WIN32_1@__scroll___win32rc = scroll_scroll_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install scroll$(EXEEXT): scroll_scroll.o $(__scroll___win32rc) - $(CXX) -o $@ scroll_scroll.o $(__scroll___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ scroll_scroll.o $(__scroll___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__scroll___mac_rezcmd) $(__scroll___mac_setfilecmd) diff --git a/samples/scroll/makefile.bcc b/samples/scroll/makefile.bcc index 4e76053e08..529a0b1148 100644 --- a/samples/scroll/makefile.bcc +++ b/samples/scroll/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -SCROLL_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SCROLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\scroll_scroll.obj: .\scroll.cpp $(CXX) -q -c -P -o$@ $(SCROLL_CXXFLAGS) $** $(OBJS)\scroll_scroll.res: .\scroll.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe -install: all - $(OBJS)\scroll.exe: $(OBJS)\scroll_scroll.obj $(OBJS)\scroll_scroll.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\scroll_scroll.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\scroll_scroll.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\scroll_scroll.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\scroll_scroll.res | - -uninstall: diff --git a/samples/scroll/makefile.gcc b/samples/scroll/makefile.gcc index f4df187851..d40b8194cf 100644 --- a/samples/scroll/makefile.gcc +++ b/samples/scroll/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### -SCROLL_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SCROLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe -install: all - $(OBJS)\scroll.exe: $(OBJS)\scroll_scroll.o $(OBJS)\scroll_scroll_rc.o - $(CXX) -o $@ $(OBJS)\scroll_scroll.o $(OBJS)\scroll_scroll_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\scroll_scroll.o $(OBJS)\scroll_scroll_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/scroll/makefile.vc b/samples/scroll/makefile.vc index 555101bb79..aa5853f797 100644 --- a/samples/scroll/makefile.vc +++ b/samples/scroll/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### -SCROLL_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SCROLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\scroll.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\scroll_scroll.obj: .\scroll.cpp $(CXX) /c /nologo /TP /Fo$@ $(SCROLL_CXXFLAGS) $** $(OBJS)\scroll_scroll.res: .\scroll.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe -install: all - $(OBJS)\scroll.exe: $(OBJS)\scroll_scroll.obj $(OBJS)\scroll_scroll.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\scroll_scroll.obj $(OBJS)\scroll_scroll.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\scroll_scroll.obj $(OBJS)\scroll_scroll.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/scroll/makefile.wat b/samples/scroll/makefile.wat index 98fcdd82cb..66210fc125 100644 --- a/samples/scroll/makefile.wat +++ b/samples/scroll/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = scroll -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SCROLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\scroll.exe + +$(OBJS)\scroll_scroll.obj : .AUTODEPEND .\scroll.cpp + $(CXX) -zq -fo=$^@ $(SCROLL_CXXFLAGS) $< + +$(OBJS)\scroll_scroll.res : .AUTODEPEND .\scroll.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe + +$(OBJS)\scroll.exe : $(OBJS)\scroll_scroll.obj $(OBJS)\scroll_scroll.res + @%create $(OBJS)\scroll.lbc + @%append $(OBJS)\scroll.lbc option quiet + @%append $(OBJS)\scroll.lbc name $^@ + @%append $(OBJS)\scroll.lbc option incremental + @%append $(OBJS)\scroll.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\scroll_scroll.obj) do @%append $(OBJS)\scroll.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\scroll.lbc diff --git a/samples/scrollsub/Makefile.in b/samples/scrollsub/Makefile.in index 92410eaf19..c76af39867 100644 --- a/samples/scrollsub/Makefile.in +++ b/samples/scrollsub/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -SCROLLSUB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +SCROLLSUB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ SCROLLSUB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$ @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o scrollsub$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o scrollsub$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__scrollsub___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__scrollsub___mac_setfilecmd = $(SETFILE) -a C scrollsub$(EXEEXT) +@COND_PLATFORM_MAC_1@__scrollsub___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C scrollsub$(EXEEXT) @COND_PLATFORM_WIN32_1@__scrollsub___win32rc = scrollsub_scrollsub_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install scrollsub$(EXEEXT): scrollsub_scrollsub.o $(__scrollsub___win32rc) - $(CXX) -o $@ scrollsub_scrollsub.o $(__scrollsub___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ scrollsub_scrollsub.o $(__scrollsub___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__scrollsub___mac_rezcmd) $(__scrollsub___mac_setfilecmd) diff --git a/samples/scrollsub/makefile.bcc b/samples/scrollsub/makefile.bcc index aa5a908a2d..57b8df1b64 100644 --- a/samples/scrollsub/makefile.bcc +++ b/samples/scrollsub/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SCROLLSUB_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SCROLLSUB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\scrollsub_scrollsub.obj: .\scrollsub.cpp $(CXX) -q -c -P -o$@ $(SCROLLSUB_CXXFLAGS) $** $(OBJS)\scrollsub_scrollsub.res: .\scrollsub.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\scrollsub.exe del $(OBJS)\scrollsub.exe -install: all - $(OBJS)\scrollsub.exe: $(OBJS)\scrollsub_scrollsub.obj $(OBJS)\scrollsub_scrollsub.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\scrollsub_scrollsub.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\scrollsub_scrollsub.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\scrollsub_scrollsub.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\scrollsub_scrollsub.res | - -uninstall: diff --git a/samples/scrollsub/makefile.gcc b/samples/scrollsub/makefile.gcc index 61192bdd26..d3b378e785 100644 --- a/samples/scrollsub/makefile.gcc +++ b/samples/scrollsub/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -48,10 +13,13 @@ WXUNIV = 0 ### Variables: ### OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SCROLLSUB_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +SCROLLSUB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\scrollsub.exe del $(OBJS)\scrollsub.exe -install: all - $(OBJS)\scrollsub.exe: $(OBJS)\scrollsub_scrollsub.o $(OBJS)\scrollsub_scrollsub_rc.o - $(CXX) -o $@ $(OBJS)\scrollsub_scrollsub.o $(OBJS)\scrollsub_scrollsub_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\scrollsub_scrollsub.o $(OBJS)\scrollsub_scrollsub_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/scrollsub/makefile.vc b/samples/scrollsub/makefile.vc index c879279914..7b68cea866 100644 --- a/samples/scrollsub/makefile.vc +++ b/samples/scrollsub/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -43,7 +13,7 @@ WXUNIV = 0 ### Variables: ### OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SCROLLSUB_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +SCROLLSUB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\scrollsub.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\scrollsub_scrollsub.obj: .\scrollsub.cpp $(CXX) /c /nologo /TP /Fo$@ $(SCROLLSUB_CXXFLAGS) $** $(OBJS)\scrollsub_scrollsub.res: .\scrollsub.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\scrollsub.exe del $(OBJS)\scrollsub.exe -install: all - $(OBJS)\scrollsub.exe: $(OBJS)\scrollsub_scrollsub.obj $(OBJS)\scrollsub_scrollsub.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\scrollsub_scrollsub.obj $(OBJS)\scrollsub_scrollsub.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\scrollsub_scrollsub.obj $(OBJS)\scrollsub_scrollsub.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/scrollsub/makefile.wat b/samples/scrollsub/makefile.wat index c320844ae5..33b95f1170 100644 --- a/samples/scrollsub/makefile.wat +++ b/samples/scrollsub/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = scrollsub -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SCROLLSUB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\scrollsub.exe + +$(OBJS)\scrollsub_scrollsub.obj : .AUTODEPEND .\scrollsub.cpp + $(CXX) -zq -fo=$^@ $(SCROLLSUB_CXXFLAGS) $< + +$(OBJS)\scrollsub_scrollsub.res : .AUTODEPEND .\scrollsub.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\scrollsub.exe del $(OBJS)\scrollsub.exe + +$(OBJS)\scrollsub.exe : $(OBJS)\scrollsub_scrollsub.obj $(OBJS)\scrollsub_scrollsub.res + @%create $(OBJS)\scrollsub.lbc + @%append $(OBJS)\scrollsub.lbc option quiet + @%append $(OBJS)\scrollsub.lbc name $^@ + @%append $(OBJS)\scrollsub.lbc option incremental + @%append $(OBJS)\scrollsub.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\scrollsub_scrollsub.obj) do @%append $(OBJS)\scrollsub.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\scrollsub.lbc diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in index a68de41a07..8e901f9fc9 100644 --- a/samples/shaped/Makefile.in +++ b/samples/shaped/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -SHAPED_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +SHAPED_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ SHAPED_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(to @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o shaped$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o shaped$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__shaped___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__shaped___mac_setfilecmd = $(SETFILE) -a C shaped$(EXEEXT) +@COND_PLATFORM_MAC_1@__shaped___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C shaped$(EXEEXT) @COND_PLATFORM_WIN32_1@__shaped___win32rc = shaped_shaped_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install shaped$(EXEEXT): shaped_shaped.o $(__shaped___win32rc) - $(CXX) -o $@ shaped_shaped.o $(__shaped___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ shaped_shaped.o $(__shaped___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__shaped___mac_rezcmd) $(__shaped___mac_setfilecmd) diff --git a/samples/shaped/makefile.bcc b/samples/shaped/makefile.bcc index 9b8b3647b5..2135cdc669 100644 --- a/samples/shaped/makefile.bcc +++ b/samples/shaped/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SHAPED_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SHAPED_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\shaped_shaped.obj: .\shaped.cpp $(CXX) -q -c -P -o$@ $(SHAPED_CXXFLAGS) $** $(OBJS)\shaped_shaped.res: .\shaped.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe -install: all - $(OBJS)\shaped.exe: $(OBJS)\shaped_shaped.obj $(OBJS)\shaped_shaped.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\shaped_shaped.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\shaped_shaped.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\shaped_shaped.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\shaped_shaped.res | - -uninstall: diff --git a/samples/shaped/makefile.gcc b/samples/shaped/makefile.gcc index d6e6b9aaf9..097d909727 100644 --- a/samples/shaped/makefile.gcc +++ b/samples/shaped/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -48,10 +13,13 @@ WXUNIV = 0 ### Variables: ### OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SHAPED_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +SHAPED_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe -install: all - $(OBJS)\shaped.exe: $(OBJS)\shaped_shaped.o $(OBJS)\shaped_shaped_rc.o - $(CXX) -o $@ $(OBJS)\shaped_shaped.o $(OBJS)\shaped_shaped_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\shaped_shaped.o $(OBJS)\shaped_shaped_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/shaped/makefile.vc b/samples/shaped/makefile.vc index e238b9ab1b..da5b92f02f 100644 --- a/samples/shaped/makefile.vc +++ b/samples/shaped/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -43,7 +13,7 @@ WXUNIV = 0 ### Variables: ### OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SHAPED_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +SHAPED_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\shaped.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\shaped_shaped.obj: .\shaped.cpp $(CXX) /c /nologo /TP /Fo$@ $(SHAPED_CXXFLAGS) $** $(OBJS)\shaped_shaped.res: .\shaped.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe -install: all - $(OBJS)\shaped.exe: $(OBJS)\shaped_shaped.obj $(OBJS)\shaped_shaped.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\shaped_shaped.obj $(OBJS)\shaped_shaped.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\shaped_shaped.obj $(OBJS)\shaped_shaped.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/shaped/makefile.wat b/samples/shaped/makefile.wat index 99c32ced97..51d5fd4663 100644 --- a/samples/shaped/makefile.wat +++ b/samples/shaped/makefile.wat @@ -1,11 +1,147 @@ -# Purpose: makefile for shaped example (Watcom) -# Created: 2000-01-03 +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= -WXDIR = $(%WXWIN) +!include ../../build/config.wat -PROGRAM = shaped -OBJECTS = $(PROGRAM).obj +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- -!include $(WXDIR)\src\makeprog.wat +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SHAPED_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\shaped.exe + +$(OBJS)\shaped_shaped.obj : .AUTODEPEND .\shaped.cpp + $(CXX) -zq -fo=$^@ $(SHAPED_CXXFLAGS) $< + +$(OBJS)\shaped_shaped.res : .AUTODEPEND .\shaped.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe + +$(OBJS)\shaped.exe : $(OBJS)\shaped_shaped.obj $(OBJS)\shaped_shaped.res + @%create $(OBJS)\shaped.lbc + @%append $(OBJS)\shaped.lbc option quiet + @%append $(OBJS)\shaped.lbc name $^@ + @%append $(OBJS)\shaped.lbc option incremental + @%append $(OBJS)\shaped.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\shaped_shaped.obj) do @%append $(OBJS)\shaped.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\shaped.lbc diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in index 499cfc6b2e..dade47fd4d 100644 --- a/samples/sockets/Makefile.in +++ b/samples/sockets/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,14 @@ top_srcdir = @top_srcdir@ ### Variables: ### -SOCKETS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +CLIENT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) +SERVER_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -43,51 +52,96 @@ SOCKETS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_0 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_6 = -d WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_0 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_6 = -i $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_0 = -i $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_6 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_0 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_6 = -i $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_0 = -i $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_6 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_0 = -i $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_6 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o sockets$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_0 = -i $(top_srcdir)/src/zlib +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_6 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_2 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_0) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_0) $(__INC_JPEG_p_6) $(__INC_PNG_p_6) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_0) $(__INC_ODBC_p_0) $(__INC_REGEX_p_0) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_6) -o client$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_3 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_0) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_0) $(__INC_JPEG_p_6) $(__INC_PNG_p_6) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_0) $(__INC_ODBC_p_0) $(__INC_REGEX_p_0) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_6) -o server$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__sockets___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__sockets___mac_setfilecmd = $(SETFILE) -a C sockets$(EXEEXT) -@COND_PLATFORM_WIN32_1@__sockets___win32rc = sockets_sockets_rc.o +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = -d __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_6 = --define __WXUNIVERSAL__ +@COND_PLATFORM_MAC_1@__client___mac_rezcmd = $(__MACOSX_RESOURCES_p_2) +@COND_PLATFORM_MAC_1@__client___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C client$(EXEEXT) +@COND_PLATFORM_WIN32_1@__client___win32rc = client_client_rc.o +@COND_PLATFORM_MAC_1@__server___mac_rezcmd = $(__MACOSX_RESOURCES_p_3) +@COND_PLATFORM_MAC_1@__server___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C server$(EXEEXT) +@COND_PLATFORM_WIN32_1@__server___win32rc = server_server_rc.o ### Targets: ### -all: sockets$(EXEEXT) +all: client$(EXEEXT) server$(EXEEXT) clean: rm -rf ./.deps rm -f -f ./*.o - rm -f sockets$(EXEEXT) + rm -f client$(EXEEXT) + rm -f server$(EXEEXT) + +client$(EXEEXT): client_client.o $(__client___win32rc) + $(CXX) -o $@ client_client.o $(__client___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(__client___mac_rezcmd) + $(__client___mac_setfilecmd) + +client_client.o: $(srcdir)/client.cpp + $(CXXC) -c -o $@ $(CLIENT_CXXFLAGS) $< + +client_client_rc.o: $(srcdir)/client.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_6) $(__INC_JPEG_p_0) $(__INC_PNG_p_0) $(__INC_ZLIB_p_6) $(__INC_ODBC_p_6) $(__INC_REGEX_p_6) --include-dir $(srcdir) $(__DLLFLAG_p_0) distclean: clean rm -f configure config.cache config.log config.status @@ -97,16 +151,16 @@ install: all install-strip: install -sockets$(EXEEXT): sockets_sockets.o $(__sockets___win32rc) - $(CXX) -o $@ sockets_sockets.o $(__sockets___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) - $(__sockets___mac_rezcmd) - $(__sockets___mac_setfilecmd) +server$(EXEEXT): server_server.o $(__server___win32rc) + $(CXX) -o $@ server_server.o $(__server___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(__server___mac_rezcmd) + $(__server___mac_setfilecmd) -sockets_sockets.o: $(srcdir)/sockets.cpp - $(CXXC) -c -o $@ $(SOCKETS_CXXFLAGS) $< +server_server.o: $(srcdir)/server.cpp + $(CXXC) -c -o $@ $(SERVER_CXXFLAGS) $< -sockets_sockets_rc.o: $(srcdir)/sockets.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) +server_server_rc.o: $(srcdir)/server.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_6) $(__INC_JPEG_p_0) $(__INC_PNG_p_0) $(__INC_ZLIB_p_6) $(__INC_ODBC_p_6) $(__INC_REGEX_p_6) --include-dir $(srcdir) $(__DLLFLAG_p_0) uninstall: diff --git a/samples/sockets/makefile.bcc b/samples/sockets/makefile.bcc new file mode 100644 index 0000000000..9b52ae58b4 --- /dev/null +++ b/samples/sockets/makefile.bcc @@ -0,0 +1,153 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +CLIENT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SERVER_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_0 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_0 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_0 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_0 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_0 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_0 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\client.exe $(OBJS)\server.exe + +$(OBJS)\client_client.obj: .\client.cpp + $(CXX) -q -c -P -o$@ $(CLIENT_CXXFLAGS) $** + +$(OBJS)\client_client.res: .\client.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_0) $** + +$(OBJS)\server_server.obj: .\server.cpp + $(CXX) -q -c -P -o$@ $(SERVER_CXXFLAGS) $** + +$(OBJS)\server_server.res: .\server.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_0) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\client.exe del $(OBJS)\client.exe + -if exist $(OBJS)\server.exe del $(OBJS)\server.exe + +$(OBJS)\client.exe: $(OBJS)\client_client.obj $(OBJS)\client_client.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\client_client.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_0).lib,, $(OBJS)\client_client.res +| + +$(OBJS)\server.exe: $(OBJS)\server_server.obj $(OBJS)\server_server.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\server_server.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_0).lib,, $(OBJS)\server_server.res +| diff --git a/samples/sockets/makefile.gcc b/samples/sockets/makefile.gcc index 8e3d17acd8..0d4a843170 100644 --- a/samples/sockets/makefile.gcc +++ b/samples/sockets/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,15 @@ WXUNIV = 0 ### Variables: ### -SOCKETS_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +CLIENT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SERVER_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,22 +40,34 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) -__DEBUG_DEFINE_p_1 = --define __WXDEBUG__ +__DEBUG_DEFINE_p_0 = --define __WXDEBUG__ endif ifeq ($(SHARED),1) __DLLFLAG_p = -DWXUSINGDLL endif ifeq ($(SHARED),1) -__DLLFLAG_p_1 = --define WXUSINGDLL +__DLLFLAG_p_0 = --define WXUSINGDLL +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG = -O2 endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1 +__UNICODE_DEFINE_p_0 = --define wxUSE_UNICODE=1 endif ifeq ($(MONOLITHIC),0) __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) @@ -101,7 +82,7 @@ ifeq ($(WXUNIV),1) __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ endif ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ +__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__ endif @@ -111,23 +92,29 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\sockets.exe +all: $(OBJS)\client.exe $(OBJS)\server.exe -$(OBJS)\sockets_sockets.o: .\sockets.cpp - $(CXX) -c -o $@ $(SOCKETS_CXXFLAGS) $< +$(OBJS)\client_client.o: .\client.cpp + $(CXX) -c -o $@ $(CLIENT_CXXFLAGS) $< -$(OBJS)\sockets_sockets_rc.o: .\sockets.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir ./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib --include-dir ./../../src/regex --include-dir . $(__DLLFLAG_p_1) +$(OBJS)\client_client_rc.o: .\client.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) --include-dir ./../../include --include-dir ./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib --include-dir ./../../src/regex --include-dir . $(__DLLFLAG_p_0) + +$(OBJS)\server_server.o: .\server.cpp + $(CXX) -c -o $@ $(SERVER_CXXFLAGS) $< + +$(OBJS)\server_server_rc.o: .\server.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) --include-dir ./../../include --include-dir ./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib --include-dir ./../../src/regex --include-dir . $(__DLLFLAG_p_0) clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o - -if exist $(OBJS)\sockets.exe del $(OBJS)\sockets.exe - -install: all + -if exist $(OBJS)\client.exe del $(OBJS)\client.exe + -if exist $(OBJS)\server.exe del $(OBJS)\server.exe -$(OBJS)\sockets.exe: $(OBJS)\sockets_sockets.o $(OBJS)\sockets_sockets_rc.o - $(CXX) -o $@ $(OBJS)\sockets_sockets.o $(OBJS)\sockets_sockets_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 +$(OBJS)\client.exe: $(OBJS)\client_client.o $(OBJS)\client_client_rc.o + $(CXX) -o $@ $(OBJS)\client_client.o $(OBJS)\client_client_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -uninstall: +$(OBJS)\server.exe: $(OBJS)\server_server.o $(OBJS)\server_server_rc.o + $(CXX) -o $@ $(OBJS)\server_server.o $(OBJS)\server_server_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/sockets/makefile.vc b/samples/sockets/makefile.vc index 7842451296..943afc01a2 100644 --- a/samples/sockets/makefile.vc +++ b/samples/sockets/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,9 @@ WXUNIV = 0 ### Variables: ### -SOCKETS_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +CLIENT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) $(__DEBUGFLAG_3) /Fd$(OBJS)\client.pdb $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SERVER_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG) $(__DEBUGFLAG_3) /Fd$(OBJS)\server.pdb $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,22 +37,52 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_3 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_3 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_4 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_4 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" -__DEBUG_DEFINE_p_1 = /d__WXDEBUG__ +__DEBUG_DEFINE_p_0 = /d__WXDEBUG__ !endif !if "$(SHARED)" == "1" __DLLFLAG_p = /DWXUSINGDLL !endif !if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /dWXUSINGDLL +__DLLFLAG_p_0 = /dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS = !endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif !if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1 +__UNICODE_DEFINE_p_0 = /dwxUSE_UNICODE=1 !endif !if "$(MONOLITHIC)" == "0" __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib @@ -96,7 +97,7 @@ __WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ !endif !if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__ +__WXUNIV_DEFINE_p_0 = /d__WXUNIVERSAL__ !endif @@ -106,24 +107,32 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\sockets.exe +all: $(OBJS)\client.exe $(OBJS)\server.exe + +$(OBJS)\client_client.obj: .\client.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CLIENT_CXXFLAGS) $** + +$(OBJS)\client_client.res: .\client.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_0) $** -$(OBJS)\sockets_sockets.obj: .\sockets.cpp - $(CXX) /c /nologo /TP /Fo$@ $(SOCKETS_CXXFLAGS) $** +$(OBJS)\server_server.obj: .\server.cpp + $(CXX) /c /nologo /TP /Fo$@ $(SERVER_CXXFLAGS) $** -$(OBJS)\sockets_sockets.res: .\sockets.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** +$(OBJS)\server_server.res: .\server.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_0) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\sockets.exe del $(OBJS)\sockets.exe + -if exist $(OBJS)\client.exe del $(OBJS)\client.exe + -if exist $(OBJS)\server.exe del $(OBJS)\server.exe -install: all - -$(OBJS)\sockets.exe: $(OBJS)\sockets_sockets.obj $(OBJS)\sockets_sockets.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\sockets_sockets.obj $(OBJS)\sockets_sockets.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib +$(OBJS)\client.exe: $(OBJS)\client_client.obj $(OBJS)\client_client.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_4) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\client_client.obj $(OBJS)\client_client.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << -uninstall: +$(OBJS)\server.exe: $(OBJS)\server_server.obj $(OBJS)\server_server.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_4) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\server_server.obj $(OBJS)\server_server.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 e70d34634f..608776fa6c 100644 --- a/samples/sockets/makefile.wat +++ b/samples/sockets/makefile.wat @@ -1,17 +1,166 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -!include $(%WXWIN)\src\makewat.env - -all: - wmake -f server.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) - wmake -f client.wat FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) - -clean: - wmake -f server.wat clean - wmake -f client.wat clean \ No newline at end of file +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG = +!ifeq BUILD debug +__DEBUGFLAG = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG = -d0 +!endif +__DEBUGFLAG_2 = +!ifeq BUILD debug +__DEBUGFLAG_2 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_2 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG = +!ifeq BUILD debug +__OPTIMIZEFLAG = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG = -ot -ox +!endif +__RUNTIME_LIBS = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +CLIENT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SERVER_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\client.exe $(OBJS)\server.exe + +$(OBJS)\client_client.obj : .AUTODEPEND .\client.cpp + $(CXX) -zq -fo=$^@ $(CLIENT_CXXFLAGS) $< + +$(OBJS)\client_client.res : .AUTODEPEND .\client.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +$(OBJS)\server_server.obj : .AUTODEPEND .\server.cpp + $(CXX) -zq -fo=$^@ $(SERVER_CXXFLAGS) $< + +$(OBJS)\server_server.res : .AUTODEPEND .\server.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\client.exe del $(OBJS)\client.exe + -if exist $(OBJS)\server.exe del $(OBJS)\server.exe + +$(OBJS)\client.exe : $(OBJS)\client_client.obj $(OBJS)\client_client.res + @%create $(OBJS)\client.lbc + @%append $(OBJS)\client.lbc option quiet + @%append $(OBJS)\client.lbc name $^@ + @%append $(OBJS)\client.lbc option incremental + @%append $(OBJS)\client.lbc $(LDFLAGS) $(__DEBUGFLAG_2) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\client_client.obj) do @%append $(OBJS)\client.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\client.lbc + +$(OBJS)\server.exe : $(OBJS)\server_server.obj $(OBJS)\server_server.res + @%create $(OBJS)\server.lbc + @%append $(OBJS)\server.lbc option quiet + @%append $(OBJS)\server.lbc name $^@ + @%append $(OBJS)\server.lbc option incremental + @%append $(OBJS)\server.lbc $(LDFLAGS) $(__DEBUGFLAG_2) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\server_server.obj) do @%append $(OBJS)\server.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\server.lbc diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in index 05fc02d051..5576b1fa79 100644 --- a/samples/splitter/Makefile.in +++ b/samples/splitter/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -SPLITTER_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +SPLITTER_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ SPLITTER_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o splitter$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o splitter$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__splitter___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__splitter___mac_setfilecmd = $(SETFILE) -a C splitter$(EXEEXT) +@COND_PLATFORM_MAC_1@__splitter___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C splitter$(EXEEXT) @COND_PLATFORM_WIN32_1@__splitter___win32rc = splitter_splitter_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install splitter$(EXEEXT): splitter_splitter.o $(__splitter___win32rc) - $(CXX) -o $@ splitter_splitter.o $(__splitter___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ splitter_splitter.o $(__splitter___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__splitter___mac_rezcmd) $(__splitter___mac_setfilecmd) diff --git a/samples/splitter/makefile.bcc b/samples/splitter/makefile.bcc index 96fdb96769..8cdd8c6fd7 100644 --- a/samples/splitter/makefile.bcc +++ b/samples/splitter/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SPLITTER_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SPLITTER_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\splitter_splitter.obj: .\splitter.cpp $(CXX) -q -c -P -o$@ $(SPLITTER_CXXFLAGS) $** $(OBJS)\splitter_splitter.res: .\splitter.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe -install: all - $(OBJS)\splitter.exe: $(OBJS)\splitter_splitter.obj $(OBJS)\splitter_splitter.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\splitter_splitter.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\splitter_splitter.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\splitter_splitter.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\splitter_splitter.res | - -uninstall: diff --git a/samples/splitter/makefile.gcc b/samples/splitter/makefile.gcc index 6c55c6e973..c00d4e35ad 100644 --- a/samples/splitter/makefile.gcc +++ b/samples/splitter/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -48,10 +13,13 @@ WXUNIV = 0 ### Variables: ### OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SPLITTER_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +SPLITTER_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe -install: all - $(OBJS)\splitter.exe: $(OBJS)\splitter_splitter.o $(OBJS)\splitter_splitter_rc.o - $(CXX) -o $@ $(OBJS)\splitter_splitter.o $(OBJS)\splitter_splitter_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\splitter_splitter.o $(OBJS)\splitter_splitter_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/splitter/makefile.vc b/samples/splitter/makefile.vc index 6650cf09a2..6ce3dbc3cd 100644 --- a/samples/splitter/makefile.vc +++ b/samples/splitter/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -43,7 +13,7 @@ WXUNIV = 0 ### Variables: ### OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -SPLITTER_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +SPLITTER_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\splitter.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\splitter_splitter.obj: .\splitter.cpp $(CXX) /c /nologo /TP /Fo$@ $(SPLITTER_CXXFLAGS) $** $(OBJS)\splitter_splitter.res: .\splitter.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe -install: all - $(OBJS)\splitter.exe: $(OBJS)\splitter_splitter.obj $(OBJS)\splitter_splitter.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\splitter_splitter.obj $(OBJS)\splitter_splitter.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\splitter_splitter.obj $(OBJS)\splitter_splitter.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/splitter/makefile.wat b/samples/splitter/makefile.wat index e90e0c5bf9..3039bfd50f 100644 --- a/samples/splitter/makefile.wat +++ b/samples/splitter/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = splitter -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SPLITTER_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\splitter.exe + +$(OBJS)\splitter_splitter.obj : .AUTODEPEND .\splitter.cpp + $(CXX) -zq -fo=$^@ $(SPLITTER_CXXFLAGS) $< + +$(OBJS)\splitter_splitter.res : .AUTODEPEND .\splitter.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe + +$(OBJS)\splitter.exe : $(OBJS)\splitter_splitter.obj $(OBJS)\splitter_splitter.res + @%create $(OBJS)\splitter.lbc + @%append $(OBJS)\splitter.lbc option quiet + @%append $(OBJS)\splitter.lbc name $^@ + @%append $(OBJS)\splitter.lbc option incremental + @%append $(OBJS)\splitter.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\splitter_splitter.obj) do @%append $(OBJS)\splitter.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\splitter.lbc diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in index 8f58fbb518..632614eaf8 100644 --- a/samples/statbar/Makefile.in +++ b/samples/statbar/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -STATBAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +STATBAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ STATBAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o statbar$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o statbar$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__statbar___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__statbar___mac_setfilecmd = $(SETFILE) -a C statbar$(EXEEXT) +@COND_PLATFORM_MAC_1@__statbar___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C statbar$(EXEEXT) @COND_PLATFORM_WIN32_1@__statbar___win32rc = statbar_statbar_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install statbar$(EXEEXT): statbar_statbar.o $(__statbar___win32rc) - $(CXX) -o $@ statbar_statbar.o $(__statbar___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ statbar_statbar.o $(__statbar___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__statbar___mac_rezcmd) $(__statbar___mac_setfilecmd) diff --git a/samples/statbar/makefile.bcc b/samples/statbar/makefile.bcc index 8cde26e26f..930817cc27 100644 --- a/samples/statbar/makefile.bcc +++ b/samples/statbar/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -STATBAR_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +STATBAR_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\statbar_statbar.obj: .\statbar.cpp $(CXX) -q -c -P -o$@ $(STATBAR_CXXFLAGS) $** $(OBJS)\statbar_statbar.res: .\statbar.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe -install: all - $(OBJS)\statbar.exe: $(OBJS)\statbar_statbar.obj $(OBJS)\statbar_statbar.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\statbar_statbar.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\statbar_statbar.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\statbar_statbar.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\statbar_statbar.res | - -uninstall: diff --git a/samples/statbar/makefile.gcc b/samples/statbar/makefile.gcc index 3f148483b8..2a935acb72 100644 --- a/samples/statbar/makefile.gcc +++ b/samples/statbar/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -48,10 +13,13 @@ WXUNIV = 0 ### Variables: ### OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -STATBAR_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +STATBAR_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe -install: all - $(OBJS)\statbar.exe: $(OBJS)\statbar_statbar.o $(OBJS)\statbar_statbar_rc.o - $(CXX) -o $@ $(OBJS)\statbar_statbar.o $(OBJS)\statbar_statbar_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\statbar_statbar.o $(OBJS)\statbar_statbar_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/statbar/makefile.vc b/samples/statbar/makefile.vc index a2a3a52248..816fc118f8 100644 --- a/samples/statbar/makefile.vc +++ b/samples/statbar/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -43,7 +13,7 @@ WXUNIV = 0 ### Variables: ### OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -STATBAR_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +STATBAR_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\statbar.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\statbar_statbar.obj: .\statbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(STATBAR_CXXFLAGS) $** $(OBJS)\statbar_statbar.res: .\statbar.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe -install: all - $(OBJS)\statbar.exe: $(OBJS)\statbar_statbar.obj $(OBJS)\statbar_statbar.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\statbar_statbar.obj $(OBJS)\statbar_statbar.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\statbar_statbar.obj $(OBJS)\statbar_statbar.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/statbar/makefile.wat b/samples/statbar/makefile.wat index 6e74737fe4..473d6417ff 100644 --- a/samples/statbar/makefile.wat +++ b/samples/statbar/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = statbar -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +STATBAR_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\statbar.exe + +$(OBJS)\statbar_statbar.obj : .AUTODEPEND .\statbar.cpp + $(CXX) -zq -fo=$^@ $(STATBAR_CXXFLAGS) $< + +$(OBJS)\statbar_statbar.res : .AUTODEPEND .\statbar.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe + +$(OBJS)\statbar.exe : $(OBJS)\statbar_statbar.obj $(OBJS)\statbar_statbar.res + @%create $(OBJS)\statbar.lbc + @%append $(OBJS)\statbar.lbc option quiet + @%append $(OBJS)\statbar.lbc name $^@ + @%append $(OBJS)\statbar.lbc option incremental + @%append $(OBJS)\statbar.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\statbar_statbar.obj) do @%append $(OBJS)\statbar.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\statbar.lbc diff --git a/samples/tab/Makefile.in b/samples/tab/Makefile.in index 352c380349..d9dbd4aa09 100644 --- a/samples/tab/Makefile.in +++ b/samples/tab/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -TAB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +TAB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,32 +52,53 @@ TAB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_s @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o tab$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o tab$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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__ @@ -98,7 +124,7 @@ install: all install-strip: install tab$(EXEEXT): tab_tab.o $(__tab___win32rc) - $(CXX) -o $@ tab_tab.o $(__tab___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ tab_tab.o $(__tab___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__tab___mac_rezcmd) $(__tab___mac_setfilecmd) diff --git a/samples/tab/makefile.bcc b/samples/tab/makefile.bcc index 90e8615edb..4c3d257fc9 100644 --- a/samples/tab/makefile.bcc +++ b/samples/tab/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -TAB_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +TAB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\tab_tab.obj: .\tab.cpp $(CXX) -q -c -P -o$@ $(TAB_CXXFLAGS) $** $(OBJS)\tab_tab.res: .\tab.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\tab.exe del $(OBJS)\tab.exe -install: all - $(OBJS)\tab.exe: $(OBJS)\tab_tab.obj $(OBJS)\tab_tab.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\tab_tab.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\tab_tab.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\tab_tab.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\tab_tab.res | - -uninstall: diff --git a/samples/tab/makefile.gcc b/samples/tab/makefile.gcc index 5f7f14ae0d..55c68005e9 100644 --- a/samples/tab/makefile.gcc +++ b/samples/tab/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -48,10 +13,13 @@ WXUNIV = 0 ### Variables: ### OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -TAB_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +TAB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\tab.exe del $(OBJS)\tab.exe -install: all - $(OBJS)\tab.exe: $(OBJS)\tab_tab.o $(OBJS)\tab_tab_rc.o - $(CXX) -o $@ $(OBJS)\tab_tab.o $(OBJS)\tab_tab_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\tab_tab.o $(OBJS)\tab_tab_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/tab/makefile.vc b/samples/tab/makefile.vc index 4beae7dab0..f8ceb91b08 100644 --- a/samples/tab/makefile.vc +++ b/samples/tab/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -43,7 +13,7 @@ WXUNIV = 0 ### Variables: ### OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -TAB_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +TAB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\tab.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\tab_tab.obj: .\tab.cpp $(CXX) /c /nologo /TP /Fo$@ $(TAB_CXXFLAGS) $** $(OBJS)\tab_tab.res: .\tab.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\tab.exe del $(OBJS)\tab.exe -install: all - $(OBJS)\tab.exe: $(OBJS)\tab_tab.obj $(OBJS)\tab_tab.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\tab_tab.obj $(OBJS)\tab_tab.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\tab_tab.obj $(OBJS)\tab_tab.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/tab/makefile.wat b/samples/tab/makefile.wat index dc155c32f3..9e077a33a3 100644 --- a/samples/tab/makefile.wat +++ b/samples/tab/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = tab -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +TAB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\tab.exe + +$(OBJS)\tab_tab.obj : .AUTODEPEND .\tab.cpp + $(CXX) -zq -fo=$^@ $(TAB_CXXFLAGS) $< + +$(OBJS)\tab_tab.res : .AUTODEPEND .\tab.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\tab.exe del $(OBJS)\tab.exe + +$(OBJS)\tab.exe : $(OBJS)\tab_tab.obj $(OBJS)\tab_tab.res + @%create $(OBJS)\tab.lbc + @%append $(OBJS)\tab.lbc option quiet + @%append $(OBJS)\tab.lbc name $^@ + @%append $(OBJS)\tab.lbc option incremental + @%append $(OBJS)\tab.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\tab_tab.obj) do @%append $(OBJS)\tab.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\tab.lbc library %i + @%append $(OBJS)\tab.lbc option resource=$(OBJS)\tab_tab.res + wlink @$(OBJS)\tab.lbc diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in index c174ba736c..bdb57df180 100644 --- a/samples/taskbar/Makefile.in +++ b/samples/taskbar/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -TASKBAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +TASKBAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,38 +52,60 @@ TASKBAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o taskbar$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o taskbar$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__taskbar___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__taskbar___mac_setfilecmd = $(SETFILE) -a C taskbar$(EXEEXT) -@COND_PLATFORM_WIN32_1@__taskbar___win32rc = taskbar_taskbar_rc.o +@COND_PLATFORM_MAC_1@__taskbar___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C taskbar$(EXEEXT) +@COND_PLATFORM_WIN32_1@__taskbar___win32rc = taskbar_tbtest_rc.o ### Targets: ### @@ -97,15 +124,15 @@ install: all install-strip: install -taskbar$(EXEEXT): taskbar_taskbar.o $(__taskbar___win32rc) - $(CXX) -o $@ taskbar_taskbar.o $(__taskbar___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) +taskbar$(EXEEXT): taskbar_tbtest.o $(__taskbar___win32rc) + $(CXX) -o $@ taskbar_tbtest.o $(__taskbar___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__taskbar___mac_rezcmd) $(__taskbar___mac_setfilecmd) -taskbar_taskbar.o: $(srcdir)/taskbar.cpp +taskbar_tbtest.o: $(srcdir)/tbtest.cpp $(CXXC) -c -o $@ $(TASKBAR_CXXFLAGS) $< -taskbar_taskbar_rc.o: $(srcdir)/taskbar.rc +taskbar_tbtest_rc.o: $(srcdir)/tbtest.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) uninstall: diff --git a/samples/taskbar/makefile.bcc b/samples/taskbar/makefile.bcc new file mode 100644 index 0000000000..a46af0c94b --- /dev/null +++ b/samples/taskbar/makefile.bcc @@ -0,0 +1,135 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +TASKBAR_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\taskbar.exe + +$(OBJS)\taskbar_tbtest.obj: .\tbtest.cpp + $(CXX) -q -c -P -o$@ $(TASKBAR_CXXFLAGS) $** + +$(OBJS)\taskbar_tbtest.res: .\tbtest.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\taskbar.exe del $(OBJS)\taskbar.exe + +$(OBJS)\taskbar.exe: $(OBJS)\taskbar_tbtest.obj $(OBJS)\taskbar_tbtest.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\taskbar_tbtest.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\taskbar_tbtest.res +| diff --git a/samples/taskbar/makefile.gcc b/samples/taskbar/makefile.gcc index a79bd33342..4bcb2c51c8 100644 --- a/samples/taskbar/makefile.gcc +++ b/samples/taskbar/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -48,10 +13,13 @@ WXUNIV = 0 ### Variables: ### OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -TASKBAR_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +TASKBAR_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -113,21 +93,17 @@ $(OBJS): all: $(OBJS)\taskbar.exe -$(OBJS)\taskbar_taskbar.o: .\taskbar.cpp +$(OBJS)\taskbar_tbtest.o: .\tbtest.cpp $(CXX) -c -o $@ $(TASKBAR_CXXFLAGS) $< -$(OBJS)\taskbar_taskbar_rc.o: .\taskbar.rc +$(OBJS)\taskbar_tbtest_rc.o: .\tbtest.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir ./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib --include-dir ./../../src/regex --include-dir . $(__DLLFLAG_p_1) clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\taskbar.exe del $(OBJS)\taskbar.exe -install: all - -$(OBJS)\taskbar.exe: $(OBJS)\taskbar_taskbar.o $(OBJS)\taskbar_taskbar_rc.o - $(CXX) -o $@ $(OBJS)\taskbar_taskbar.o $(OBJS)\taskbar_taskbar_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: +$(OBJS)\taskbar.exe: $(OBJS)\taskbar_tbtest.o $(OBJS)\taskbar_tbtest_rc.o + $(CXX) -o $@ $(OBJS)\taskbar_tbtest.o $(OBJS)\taskbar_tbtest_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/taskbar/makefile.vc b/samples/taskbar/makefile.vc index a92b57ff3e..af432527d4 100644 --- a/samples/taskbar/makefile.vc +++ b/samples/taskbar/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -43,7 +13,7 @@ WXUNIV = 0 ### Variables: ### OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -TASKBAR_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +TASKBAR_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\taskbar.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -108,22 +108,18 @@ $(OBJS): all: $(OBJS)\taskbar.exe -$(OBJS)\taskbar_taskbar.obj: .\taskbar.cpp +$(OBJS)\taskbar_tbtest.obj: .\tbtest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TASKBAR_CXXFLAGS) $** -$(OBJS)\taskbar_taskbar.res: .\taskbar.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** +$(OBJS)\taskbar_tbtest.res: .\tbtest.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\taskbar.exe del $(OBJS)\taskbar.exe -install: all - -$(OBJS)\taskbar.exe: $(OBJS)\taskbar_taskbar.obj $(OBJS)\taskbar_taskbar.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\taskbar_taskbar.obj $(OBJS)\taskbar_taskbar.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib +$(OBJS)\taskbar.exe: $(OBJS)\taskbar_tbtest.obj $(OBJS)\taskbar_tbtest.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\taskbar_tbtest.obj $(OBJS)\taskbar_tbtest.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/taskbar/makefile.wat b/samples/taskbar/makefile.wat index 88489d3dce..53f6c1630b 100644 --- a/samples/taskbar/makefile.wat +++ b/samples/taskbar/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = tbtest -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +TASKBAR_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\taskbar.exe + +$(OBJS)\taskbar_tbtest.obj : .AUTODEPEND .\tbtest.cpp + $(CXX) -zq -fo=$^@ $(TASKBAR_CXXFLAGS) $< + +$(OBJS)\taskbar_tbtest.res : .AUTODEPEND .\tbtest.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\taskbar.exe del $(OBJS)\taskbar.exe + +$(OBJS)\taskbar.exe : $(OBJS)\taskbar_tbtest.obj $(OBJS)\taskbar_tbtest.res + @%create $(OBJS)\taskbar.lbc + @%append $(OBJS)\taskbar.lbc option quiet + @%append $(OBJS)\taskbar.lbc name $^@ + @%append $(OBJS)\taskbar.lbc option incremental + @%append $(OBJS)\taskbar.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\taskbar_tbtest.obj) do @%append $(OBJS)\taskbar.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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_tbtest.res + wlink @$(OBJS)\taskbar.lbc diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in index 93ef1248a3..64022d5b32 100644 --- a/samples/text/Makefile.in +++ b/samples/text/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -TEXT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +TEXT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ TEXT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_ @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o text$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o text$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__text___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__text___mac_setfilecmd = $(SETFILE) -a C text$(EXEEXT) +@COND_PLATFORM_MAC_1@__text___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C text$(EXEEXT) @COND_PLATFORM_WIN32_1@__text___win32rc = text_text_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install text$(EXEEXT): text_text.o $(__text___win32rc) - $(CXX) -o $@ text_text.o $(__text___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ text_text.o $(__text___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__text___mac_rezcmd) $(__text___mac_setfilecmd) diff --git a/samples/text/makefile.bcc b/samples/text/makefile.bcc index 8f3bf33028..6c12b5a49e 100644 --- a/samples/text/makefile.bcc +++ b/samples/text/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -TEXT_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +TEXT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\text_text.obj: .\text.cpp $(CXX) -q -c -P -o$@ $(TEXT_CXXFLAGS) $** $(OBJS)\text_text.res: .\text.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\text.exe del $(OBJS)\text.exe -install: all - $(OBJS)\text.exe: $(OBJS)\text_text.obj $(OBJS)\text_text.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\text_text.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\text_text.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\text_text.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\text_text.res | - -uninstall: diff --git a/samples/text/makefile.gcc b/samples/text/makefile.gcc index 9ce6c48385..3b77000b00 100644 --- a/samples/text/makefile.gcc +++ b/samples/text/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -48,10 +13,13 @@ WXUNIV = 0 ### Variables: ### OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -TEXT_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +TEXT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\text.exe del $(OBJS)\text.exe -install: all - $(OBJS)\text.exe: $(OBJS)\text_text.o $(OBJS)\text_text_rc.o - $(CXX) -o $@ $(OBJS)\text_text.o $(OBJS)\text_text_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\text_text.o $(OBJS)\text_text_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/text/makefile.vc b/samples/text/makefile.vc index dd256d8478..78d3eb8a58 100644 --- a/samples/text/makefile.vc +++ b/samples/text/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -43,7 +13,7 @@ WXUNIV = 0 ### Variables: ### OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -TEXT_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +TEXT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\text.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\text_text.obj: .\text.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEXT_CXXFLAGS) $** $(OBJS)\text_text.res: .\text.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\text.exe del $(OBJS)\text.exe -install: all - $(OBJS)\text.exe: $(OBJS)\text_text.obj $(OBJS)\text_text.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\text_text.obj $(OBJS)\text_text.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\text_text.obj $(OBJS)\text_text.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/text/makefile.wat b/samples/text/makefile.wat index 96cd8516a7..2542c5758e 100644 --- a/samples/text/makefile.wat +++ b/samples/text/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = text -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +TEXT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\text.exe + +$(OBJS)\text_text.obj : .AUTODEPEND .\text.cpp + $(CXX) -zq -fo=$^@ $(TEXT_CXXFLAGS) $< + +$(OBJS)\text_text.res : .AUTODEPEND .\text.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\text.exe del $(OBJS)\text.exe + +$(OBJS)\text.exe : $(OBJS)\text_text.obj $(OBJS)\text_text.res + @%create $(OBJS)\text.lbc + @%append $(OBJS)\text.lbc option quiet + @%append $(OBJS)\text.lbc name $^@ + @%append $(OBJS)\text.lbc option incremental + @%append $(OBJS)\text.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\text_text.obj) do @%append $(OBJS)\text.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\text.lbc diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in index 0bdf9f930f..5f6fbd6d92 100644 --- a/samples/thread/Makefile.in +++ b/samples/thread/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -THREAD_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +THREAD_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ THREAD_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(to @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o thread$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o thread$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__thread___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__thread___mac_setfilecmd = $(SETFILE) -a C thread$(EXEEXT) +@COND_PLATFORM_MAC_1@__thread___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C thread$(EXEEXT) @COND_PLATFORM_WIN32_1@__thread___win32rc = thread_thread_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install thread$(EXEEXT): thread_thread.o $(__thread___win32rc) - $(CXX) -o $@ thread_thread.o $(__thread___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ thread_thread.o $(__thread___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__thread___mac_rezcmd) $(__thread___mac_setfilecmd) diff --git a/samples/thread/makefile.bcc b/samples/thread/makefile.bcc index 083761259d..5dda70f289 100644 --- a/samples/thread/makefile.bcc +++ b/samples/thread/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -THREAD_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +THREAD_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\thread_thread.obj: .\thread.cpp $(CXX) -q -c -P -o$@ $(THREAD_CXXFLAGS) $** $(OBJS)\thread_thread.res: .\thread.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe -install: all - $(OBJS)\thread.exe: $(OBJS)\thread_thread.obj $(OBJS)\thread_thread.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\thread_thread.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\thread_thread.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\thread_thread.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\thread_thread.res | - -uninstall: diff --git a/samples/thread/makefile.gcc b/samples/thread/makefile.gcc index 7fa0d9ac4d..232d1693e7 100644 --- a/samples/thread/makefile.gcc +++ b/samples/thread/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### -THREAD_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +THREAD_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe -install: all - $(OBJS)\thread.exe: $(OBJS)\thread_thread.o $(OBJS)\thread_thread_rc.o - $(CXX) -o $@ $(OBJS)\thread_thread.o $(OBJS)\thread_thread_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\thread_thread.o $(OBJS)\thread_thread_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/thread/makefile.vc b/samples/thread/makefile.vc index b9b0b3e248..89b31758d5 100644 --- a/samples/thread/makefile.vc +++ b/samples/thread/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### -THREAD_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +THREAD_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\thread.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\thread_thread.obj: .\thread.cpp $(CXX) /c /nologo /TP /Fo$@ $(THREAD_CXXFLAGS) $** $(OBJS)\thread_thread.res: .\thread.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe -install: all - $(OBJS)\thread.exe: $(OBJS)\thread_thread.obj $(OBJS)\thread_thread.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\thread_thread.obj $(OBJS)\thread_thread.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\thread_thread.obj $(OBJS)\thread_thread.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/thread/makefile.wat b/samples/thread/makefile.wat index 7145fd7188..d12839dc08 100644 --- a/samples/thread/makefile.wat +++ b/samples/thread/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = thread -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +THREAD_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\thread.exe + +$(OBJS)\thread_thread.obj : .AUTODEPEND .\thread.cpp + $(CXX) -zq -fo=$^@ $(THREAD_CXXFLAGS) $< + +$(OBJS)\thread_thread.res : .AUTODEPEND .\thread.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe + +$(OBJS)\thread.exe : $(OBJS)\thread_thread.obj $(OBJS)\thread_thread.res + @%create $(OBJS)\thread.lbc + @%append $(OBJS)\thread.lbc option quiet + @%append $(OBJS)\thread.lbc name $^@ + @%append $(OBJS)\thread.lbc option incremental + @%append $(OBJS)\thread.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\thread_thread.obj) do @%append $(OBJS)\thread.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\thread.lbc diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in index b8a749318f..3eb6045057 100644 --- a/samples/toolbar/Makefile.in +++ b/samples/toolbar/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -TOOLBAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +TOOLBAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ TOOLBAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o toolbar$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o toolbar$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__toolbar___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__toolbar___mac_setfilecmd = $(SETFILE) -a C toolbar$(EXEEXT) +@COND_PLATFORM_MAC_1@__toolbar___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C toolbar$(EXEEXT) @COND_PLATFORM_WIN32_1@__toolbar___win32rc = toolbar_toolbar_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install toolbar$(EXEEXT): toolbar_toolbar.o $(__toolbar___win32rc) - $(CXX) -o $@ toolbar_toolbar.o $(__toolbar___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ toolbar_toolbar.o $(__toolbar___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__toolbar___mac_rezcmd) $(__toolbar___mac_setfilecmd) diff --git a/samples/toolbar/makefile.bcc b/samples/toolbar/makefile.bcc index c35386880f..1985567706 100644 --- a/samples/toolbar/makefile.bcc +++ b/samples/toolbar/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -TOOLBAR_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +TOOLBAR_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\toolbar_toolbar.obj: .\toolbar.cpp $(CXX) -q -c -P -o$@ $(TOOLBAR_CXXFLAGS) $** $(OBJS)\toolbar_toolbar.res: .\toolbar.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\toolbar.exe del $(OBJS)\toolbar.exe -install: all - $(OBJS)\toolbar.exe: $(OBJS)\toolbar_toolbar.obj $(OBJS)\toolbar_toolbar.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\toolbar_toolbar.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\toolbar_toolbar.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\toolbar_toolbar.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\toolbar_toolbar.res | - -uninstall: diff --git a/samples/toolbar/makefile.gcc b/samples/toolbar/makefile.gcc index a54d3d19df..af4c856c5a 100644 --- a/samples/toolbar/makefile.gcc +++ b/samples/toolbar/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -48,10 +13,13 @@ WXUNIV = 0 ### Variables: ### OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -TOOLBAR_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +TOOLBAR_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\toolbar.exe del $(OBJS)\toolbar.exe -install: all - $(OBJS)\toolbar.exe: $(OBJS)\toolbar_toolbar.o $(OBJS)\toolbar_toolbar_rc.o - $(CXX) -o $@ $(OBJS)\toolbar_toolbar.o $(OBJS)\toolbar_toolbar_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\toolbar_toolbar.o $(OBJS)\toolbar_toolbar_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/toolbar/makefile.vc b/samples/toolbar/makefile.vc index 4cf0b65c32..4eae8515bc 100644 --- a/samples/toolbar/makefile.vc +++ b/samples/toolbar/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -43,7 +13,7 @@ WXUNIV = 0 ### Variables: ### OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -TOOLBAR_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +TOOLBAR_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\toolbar.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\toolbar_toolbar.obj: .\toolbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(TOOLBAR_CXXFLAGS) $** $(OBJS)\toolbar_toolbar.res: .\toolbar.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\toolbar.exe del $(OBJS)\toolbar.exe -install: all - $(OBJS)\toolbar.exe: $(OBJS)\toolbar_toolbar.obj $(OBJS)\toolbar_toolbar.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\toolbar_toolbar.obj $(OBJS)\toolbar_toolbar.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\toolbar_toolbar.obj $(OBJS)\toolbar_toolbar.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/toolbar/makefile.wat b/samples/toolbar/makefile.wat index 89fefeb0fc..3aa466e12e 100644 --- a/samples/toolbar/makefile.wat +++ b/samples/toolbar/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = toolbar -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +TOOLBAR_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\toolbar.exe + +$(OBJS)\toolbar_toolbar.obj : .AUTODEPEND .\toolbar.cpp + $(CXX) -zq -fo=$^@ $(TOOLBAR_CXXFLAGS) $< + +$(OBJS)\toolbar_toolbar.res : .AUTODEPEND .\toolbar.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\toolbar.exe del $(OBJS)\toolbar.exe + +$(OBJS)\toolbar.exe : $(OBJS)\toolbar_toolbar.obj $(OBJS)\toolbar_toolbar.res + @%create $(OBJS)\toolbar.lbc + @%append $(OBJS)\toolbar.lbc option quiet + @%append $(OBJS)\toolbar.lbc name $^@ + @%append $(OBJS)\toolbar.lbc option incremental + @%append $(OBJS)\toolbar.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\toolbar_toolbar.obj) do @%append $(OBJS)\toolbar.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\toolbar.lbc diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in index 32856e6ef2..94bdeb6bef 100644 --- a/samples/treectrl/Makefile.in +++ b/samples/treectrl/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -TREECTRL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +TREECTRL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ TREECTRL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o treectrl$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o treectrl$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__treectrl___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__treectrl___mac_setfilecmd = $(SETFILE) -a C treectrl$(EXEEXT) +@COND_PLATFORM_MAC_1@__treectrl___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C treectrl$(EXEEXT) @COND_PLATFORM_WIN32_1@__treectrl___win32rc = treectrl_treetest_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install treectrl$(EXEEXT): treectrl_treetest.o $(__treectrl___win32rc) - $(CXX) -o $@ treectrl_treetest.o $(__treectrl___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ treectrl_treetest.o $(__treectrl___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__treectrl___mac_rezcmd) $(__treectrl___mac_setfilecmd) diff --git a/samples/treectrl/makefile.bcc b/samples/treectrl/makefile.bcc index bc3fae0a75..24a2820f87 100644 --- a/samples/treectrl/makefile.bcc +++ b/samples/treectrl/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -TREECTRL_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +TREECTRL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -139,22 +118,18 @@ $(OBJS): all: $(OBJS)\treectrl.exe -$(OBJS)\treectrl_treectrl.obj: .\treectrl.cpp +$(OBJS)\treectrl_treetest.obj: .\treetest.cpp $(CXX) -q -c -P -o$@ $(TREECTRL_CXXFLAGS) $** -$(OBJS)\treectrl_treectrl.res: .\treectrl.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** +$(OBJS)\treectrl_treetest.res: .\treetest.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\treectrl.exe del $(OBJS)\treectrl.exe -install: all - -$(OBJS)\treectrl.exe: $(OBJS)\treectrl_treectrl.obj $(OBJS)\treectrl_treectrl.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\treectrl_treectrl.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\treectrl_treectrl.res +$(OBJS)\treectrl.exe: $(OBJS)\treectrl_treetest.obj $(OBJS)\treectrl_treetest.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\treectrl_treetest.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\treectrl_treetest.res | - -uninstall: diff --git a/samples/treectrl/makefile.gcc b/samples/treectrl/makefile.gcc index 7980b843f4..eeef2db625 100644 --- a/samples/treectrl/makefile.gcc +++ b/samples/treectrl/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -48,10 +13,13 @@ WXUNIV = 0 ### Variables: ### OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -TREECTRL_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +TREECTRL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\treectrl.exe del $(OBJS)\treectrl.exe -install: all - $(OBJS)\treectrl.exe: $(OBJS)\treectrl_treetest.o $(OBJS)\treectrl_treetest_rc.o - $(CXX) -o $@ $(OBJS)\treectrl_treetest.o $(OBJS)\treectrl_treetest_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\treectrl_treetest.o $(OBJS)\treectrl_treetest_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/treectrl/makefile.vc b/samples/treectrl/makefile.vc index 7138355d5a..08f1e00938 100644 --- a/samples/treectrl/makefile.vc +++ b/samples/treectrl/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -43,7 +13,7 @@ WXUNIV = 0 ### Variables: ### OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -TREECTRL_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +TREECTRL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\treectrl.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -108,22 +108,18 @@ $(OBJS): all: $(OBJS)\treectrl.exe -$(OBJS)\treectrl_treectrl.obj: .\treectrl.cpp +$(OBJS)\treectrl_treetest.obj: .\treetest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TREECTRL_CXXFLAGS) $** -$(OBJS)\treectrl_treectrl.res: .\treectrl.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** +$(OBJS)\treectrl_treetest.res: .\treetest.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\treectrl.exe del $(OBJS)\treectrl.exe -install: all - -$(OBJS)\treectrl.exe: $(OBJS)\treectrl_treectrl.obj $(OBJS)\treectrl_treectrl.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\treectrl_treectrl.obj $(OBJS)\treectrl_treectrl.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib +$(OBJS)\treectrl.exe: $(OBJS)\treectrl_treetest.obj $(OBJS)\treectrl_treetest.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\treectrl_treetest.obj $(OBJS)\treectrl_treetest.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/treectrl/makefile.wat b/samples/treectrl/makefile.wat index 4b9af1cdf8..dc5405145b 100644 --- a/samples/treectrl/makefile.wat +++ b/samples/treectrl/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = treetest -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +TREECTRL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\treectrl.exe + +$(OBJS)\treectrl_treetest.obj : .AUTODEPEND .\treetest.cpp + $(CXX) -zq -fo=$^@ $(TREECTRL_CXXFLAGS) $< + +$(OBJS)\treectrl_treetest.res : .AUTODEPEND .\treetest.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\treectrl.exe del $(OBJS)\treectrl.exe + +$(OBJS)\treectrl.exe : $(OBJS)\treectrl_treetest.obj $(OBJS)\treectrl_treetest.res + @%create $(OBJS)\treectrl.lbc + @%append $(OBJS)\treectrl.lbc option quiet + @%append $(OBJS)\treectrl.lbc name $^@ + @%append $(OBJS)\treectrl.lbc option incremental + @%append $(OBJS)\treectrl.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\treectrl_treetest.obj) do @%append $(OBJS)\treectrl.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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_treetest.res + wlink @$(OBJS)\treectrl.lbc diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in index 1ff7a8356d..ef28f62003 100644 --- a/samples/typetest/Makefile.in +++ b/samples/typetest/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -TYPETEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +TYPETEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ TYPETEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o typetest$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o typetest$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__typetest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__typetest___mac_setfilecmd = $(SETFILE) -a C typetest$(EXEEXT) +@COND_PLATFORM_MAC_1@__typetest___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C typetest$(EXEEXT) @COND_PLATFORM_WIN32_1@__typetest___win32rc = typetest_typetest_rc.o ### Targets: ### @@ -98,7 +125,7 @@ install: all install-strip: install typetest$(EXEEXT): typetest_typetest.o $(__typetest___win32rc) - $(CXX) -o $@ typetest_typetest.o $(__typetest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ typetest_typetest.o $(__typetest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__typetest___mac_rezcmd) $(__typetest___mac_setfilecmd) diff --git a/samples/typetest/makefile.bcc b/samples/typetest/makefile.bcc index 53763c2da1..b69b412cd7 100644 --- a/samples/typetest/makefile.bcc +++ b/samples/typetest/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -TYPETEST_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +TYPETEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\typetest_typetest.obj: .\typetest.cpp $(CXX) -q -c -P -o$@ $(TYPETEST_CXXFLAGS) $** $(OBJS)\typetest_typetest.res: .\typetest.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe -install: all - $(OBJS)\typetest.exe: $(OBJS)\typetest_typetest.obj $(OBJS)\typetest_typetest.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\typetest_typetest.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\typetest_typetest.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\typetest_typetest.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\typetest_typetest.res | - -uninstall: diff --git a/samples/typetest/makefile.gcc b/samples/typetest/makefile.gcc index 04fd5ba185..a3fc07798c 100644 --- a/samples/typetest/makefile.gcc +++ b/samples/typetest/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -48,10 +13,13 @@ WXUNIV = 0 ### Variables: ### OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -TYPETEST_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +TYPETEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe -install: all - $(OBJS)\typetest.exe: $(OBJS)\typetest_typetest.o $(OBJS)\typetest_typetest_rc.o - $(CXX) -o $@ $(OBJS)\typetest_typetest.o $(OBJS)\typetest_typetest_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -uninstall: + $(CXX) -o $@ $(OBJS)\typetest_typetest.o $(OBJS)\typetest_typetest_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/typetest/makefile.vc b/samples/typetest/makefile.vc index 3e51bb166f..560d74ee85 100644 --- a/samples/typetest/makefile.vc +++ b/samples/typetest/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -43,7 +13,7 @@ WXUNIV = 0 ### Variables: ### OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -TYPETEST_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +TYPETEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\typetest.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\typetest_typetest.obj: .\typetest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TYPETEST_CXXFLAGS) $** $(OBJS)\typetest_typetest.res: .\typetest.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe -install: all - $(OBJS)\typetest.exe: $(OBJS)\typetest_typetest.obj $(OBJS)\typetest_typetest.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\typetest_typetest.obj $(OBJS)\typetest_typetest.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\typetest_typetest.obj $(OBJS)\typetest_typetest.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << - -uninstall: diff --git a/samples/typetest/makefile.wat b/samples/typetest/makefile.wat index d5d01b893d..1e76325a37 100644 --- a/samples/typetest/makefile.wat +++ b/samples/typetest/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = typetest -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +TYPETEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\typetest.exe + +$(OBJS)\typetest_typetest.obj : .AUTODEPEND .\typetest.cpp + $(CXX) -zq -fo=$^@ $(TYPETEST_CXXFLAGS) $< + +$(OBJS)\typetest_typetest.res : .AUTODEPEND .\typetest.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe + +$(OBJS)\typetest.exe : $(OBJS)\typetest_typetest.obj $(OBJS)\typetest_typetest.res + @%create $(OBJS)\typetest.lbc + @%append $(OBJS)\typetest.lbc option quiet + @%append $(OBJS)\typetest.lbc name $^@ + @%append $(OBJS)\typetest.lbc option incremental + @%append $(OBJS)\typetest.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\typetest_typetest.obj) do @%append $(OBJS)\typetest.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\typetest.lbc diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in index cca5c0a643..9b9097f54f 100644 --- a/samples/validate/Makefile.in +++ b/samples/validate/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -VALIDATE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +VALIDATE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ VALIDATE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$( @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o validate$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o validate$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__validate___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__validate___mac_setfilecmd = $(SETFILE) -a C validate$(EXEEXT) +@COND_PLATFORM_MAC_1@__validate___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C validate$(EXEEXT) @COND_PLATFORM_WIN32_1@__validate___win32rc = validate_validate_rc.o ### Targets: ### @@ -100,7 +127,7 @@ install-strip: install uninstall: validate$(EXEEXT): validate_validate.o $(__validate___win32rc) - $(CXX) -o $@ validate_validate.o $(__validate___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ validate_validate.o $(__validate___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__validate___mac_rezcmd) $(__validate___mac_setfilecmd) diff --git a/samples/validate/makefile.bcc b/samples/validate/makefile.bcc index b66e234b26..59b80cf465 100644 --- a/samples/validate/makefile.bcc +++ b/samples/validate/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -VALIDATE_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +VALIDATE_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\validate_validate.obj: .\validate.cpp $(CXX) -q -c -P -o$@ $(VALIDATE_CXXFLAGS) $** $(OBJS)\validate_validate.res: .\validate.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\validate.exe del $(OBJS)\validate.exe -install: all - -uninstall: - $(OBJS)\validate.exe: $(OBJS)\validate_validate.obj $(OBJS)\validate_validate.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\validate_validate.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\validate_validate.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\validate_validate.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\validate_validate.res | diff --git a/samples/validate/makefile.gcc b/samples/validate/makefile.gcc index a3f2e5d937..849758ccc2 100644 --- a/samples/validate/makefile.gcc +++ b/samples/validate/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -47,11 +12,14 @@ WXUNIV = 0 ### Variables: ### -VALIDATE_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +VALIDATE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\validate.exe del $(OBJS)\validate.exe -install: all - -uninstall: - $(OBJS)\validate.exe: $(OBJS)\validate_validate.o $(OBJS)\validate_validate_rc.o - $(CXX) -o $@ $(OBJS)\validate_validate.o $(OBJS)\validate_validate_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(OBJS)\validate_validate.o $(OBJS)\validate_validate_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/validate/makefile.vc b/samples/validate/makefile.vc index b49713f6b9..63ef004367 100644 --- a/samples/validate/makefile.vc +++ b/samples/validate/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -42,8 +12,8 @@ WXUNIV = 0 ### Variables: ### -VALIDATE_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +VALIDATE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\validate.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\validate_validate.obj: .\validate.cpp $(CXX) /c /nologo /TP /Fo$@ $(VALIDATE_CXXFLAGS) $** $(OBJS)\validate_validate.res: .\validate.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\validate.exe del $(OBJS)\validate.exe -install: all - -uninstall: - $(OBJS)\validate.exe: $(OBJS)\validate_validate.obj $(OBJS)\validate_validate.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\validate_validate.obj $(OBJS)\validate_validate.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\validate_validate.obj $(OBJS)\validate_validate.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 ba7088ba90..ae29bc4b62 100644 --- a/samples/validate/makefile.wat +++ b/samples/validate/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = validate -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +VALIDATE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\validate.exe + +$(OBJS)\validate_validate.obj : .AUTODEPEND .\validate.cpp + $(CXX) -zq -fo=$^@ $(VALIDATE_CXXFLAGS) $< + +$(OBJS)\validate_validate.res : .AUTODEPEND .\validate.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\validate.exe del $(OBJS)\validate.exe + +$(OBJS)\validate.exe : $(OBJS)\validate_validate.obj $(OBJS)\validate_validate.res + @%create $(OBJS)\validate.lbc + @%append $(OBJS)\validate.lbc option quiet + @%append $(OBJS)\validate.lbc name $^@ + @%append $(OBJS)\validate.lbc option incremental + @%append $(OBJS)\validate.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\validate_validate.obj) do @%append $(OBJS)\validate.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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_validate.res + wlink @$(OBJS)\validate.lbc diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in index f2345a43c8..0a2254dfe5 100644 --- a/samples/vscroll/Makefile.in +++ b/samples/vscroll/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -VSCROLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +VSCROLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ VSCROLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o vscroll$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o vscroll$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__vscroll___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__vscroll___mac_setfilecmd = $(SETFILE) -a C vscroll$(EXEEXT) +@COND_PLATFORM_MAC_1@__vscroll___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C vscroll$(EXEEXT) @COND_PLATFORM_WIN32_1@__vscroll___win32rc = vscroll_vscroll_rc.o ### Targets: ### @@ -100,7 +127,7 @@ install-strip: install uninstall: vscroll$(EXEEXT): vscroll_vscroll.o $(__vscroll___win32rc) - $(CXX) -o $@ vscroll_vscroll.o $(__vscroll___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ vscroll_vscroll.o $(__vscroll___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__vscroll___mac_rezcmd) $(__vscroll___mac_setfilecmd) diff --git a/samples/vscroll/makefile.bcc b/samples/vscroll/makefile.bcc new file mode 100644 index 0000000000..5f6bafa5be --- /dev/null +++ b/samples/vscroll/makefile.bcc @@ -0,0 +1,135 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +VSCROLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\vscroll.exe + +$(OBJS)\vscroll_vscroll.obj: .\vscroll.cpp + $(CXX) -q -c -P -o$@ $(VSCROLL_CXXFLAGS) $** + +$(OBJS)\vscroll_vscroll.res: .\vscroll.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\vscroll.exe del $(OBJS)\vscroll.exe + +$(OBJS)\vscroll.exe: $(OBJS)\vscroll_vscroll.obj $(OBJS)\vscroll_vscroll.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\vscroll_vscroll.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\vscroll_vscroll.res +| diff --git a/samples/vscroll/makefile.gcc b/samples/vscroll/makefile.gcc index 048c35c94e..b4d9323dad 100644 --- a/samples/vscroll/makefile.gcc +++ b/samples/vscroll/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -48,10 +13,13 @@ WXUNIV = 0 ### Variables: ### OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -VSCROLL_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +VSCROLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\vscroll.exe del $(OBJS)\vscroll.exe -install: all - -uninstall: - $(OBJS)\vscroll.exe: $(OBJS)\vscroll_vscroll.o $(OBJS)\vscroll_vscroll_rc.o - $(CXX) -o $@ $(OBJS)\vscroll_vscroll.o $(OBJS)\vscroll_vscroll_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(OBJS)\vscroll_vscroll.o $(OBJS)\vscroll_vscroll_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/vscroll/makefile.vc b/samples/vscroll/makefile.vc new file mode 100644 index 0000000000..8c4bef6188 --- /dev/null +++ b/samples/vscroll/makefile.vc @@ -0,0 +1,125 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +VSCROLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\vscroll.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = /d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\vscroll.exe + +$(OBJS)\vscroll_vscroll.obj: .\vscroll.cpp + $(CXX) /c /nologo /TP /Fo$@ $(VSCROLL_CXXFLAGS) $** + +$(OBJS)\vscroll_vscroll.res: .\vscroll.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\vscroll.exe del $(OBJS)\vscroll.exe + +$(OBJS)\vscroll.exe: $(OBJS)\vscroll_vscroll.obj $(OBJS)\vscroll_vscroll.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\vscroll_vscroll.obj $(OBJS)\vscroll_vscroll.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 new file mode 100644 index 0000000000..a2665ce24c --- /dev/null +++ b/samples/vscroll/makefile.wat @@ -0,0 +1,147 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +VSCROLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\vscroll.exe + +$(OBJS)\vscroll_vscroll.obj : .AUTODEPEND .\vscroll.cpp + $(CXX) -zq -fo=$^@ $(VSCROLL_CXXFLAGS) $< + +$(OBJS)\vscroll_vscroll.res : .AUTODEPEND .\vscroll.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\vscroll.exe del $(OBJS)\vscroll.exe + +$(OBJS)\vscroll.exe : $(OBJS)\vscroll_vscroll.obj $(OBJS)\vscroll_vscroll.res + @%create $(OBJS)\vscroll.lbc + @%append $(OBJS)\vscroll.lbc option quiet + @%append $(OBJS)\vscroll.lbc name $^@ + @%append $(OBJS)\vscroll.lbc option incremental + @%append $(OBJS)\vscroll.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\vscroll_vscroll.obj) do @%append $(OBJS)\vscroll.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\vscroll.lbc library %i + @%append $(OBJS)\vscroll.lbc option resource=$(OBJS)\vscroll_vscroll.res + wlink @$(OBJS)\vscroll.lbc diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in index 91bea033f8..3c2c09e534 100644 --- a/samples/widgets/Makefile.in +++ b/samples/widgets/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -WIDGETS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +WIDGETS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ WIDGETS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o widgets$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o widgets$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__widgets___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__widgets___mac_setfilecmd = $(SETFILE) -a C widgets$(EXEEXT) +@COND_PLATFORM_MAC_1@__widgets___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C widgets$(EXEEXT) @COND_PLATFORM_WIN32_1@__widgets___win32rc = widgets_widgets_rc.o ### Targets: ### @@ -100,7 +127,7 @@ install-strip: install uninstall: widgets$(EXEEXT): widgets_button.o widgets_combobox.o widgets_gauge.o widgets_listbox.o widgets_notebook.o widgets_radiobox.o widgets_slider.o widgets_spinbtn.o widgets_static.o widgets_textctrl.o widgets_widgets.o $(__widgets___win32rc) - $(CXX) -o $@ widgets_button.o widgets_combobox.o widgets_gauge.o widgets_listbox.o widgets_notebook.o widgets_radiobox.o widgets_slider.o widgets_spinbtn.o widgets_static.o widgets_textctrl.o widgets_widgets.o $(__widgets___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ widgets_button.o widgets_combobox.o widgets_gauge.o widgets_listbox.o widgets_notebook.o widgets_radiobox.o widgets_slider.o widgets_spinbtn.o widgets_static.o widgets_textctrl.o widgets_widgets.o $(__widgets___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__widgets___mac_rezcmd) $(__widgets___mac_setfilecmd) diff --git a/samples/widgets/makefile.bcc b/samples/widgets/makefile.bcc index 5cfde2abfb..17052b867c 100644 --- a/samples/widgets/makefile.bcc +++ b/samples/widgets/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -WIDGETS_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +WIDGETS_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -173,18 +152,14 @@ $(OBJS)\widgets_widgets.obj: .\widgets.cpp $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $** $(OBJS)\widgets_widgets.res: .\widgets.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe -install: all - -uninstall: - $(OBJS)\widgets.exe: $(OBJS)\widgets_button.obj $(OBJS)\widgets_combobox.obj $(OBJS)\widgets_gauge.obj $(OBJS)\widgets_listbox.obj $(OBJS)\widgets_notebook.obj $(OBJS)\widgets_radiobox.obj $(OBJS)\widgets_slider.obj $(OBJS)\widgets_spinbtn.obj $(OBJS)\widgets_static.obj $(OBJS)\widgets_textctrl.obj $(OBJS)\widgets_widgets.obj $(OBJS)\widgets_widgets.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\widgets_button.obj $(OBJS)\widgets_combobox.obj $(OBJS)\widgets_gauge.obj $(OBJS)\widgets_listbox.obj $(OBJS)\widgets_notebook.obj $(OBJS)\widgets_radiobox.obj $(OBJS)\widgets_slider.obj $(OBJS)\widgets_spinbtn.obj $(OBJS)\widgets_static.obj $(OBJS)\widgets_textctrl.obj $(OBJS)\widgets_widgets.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\widgets_widgets.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\widgets_button.obj $(OBJS)\widgets_combobox.obj $(OBJS)\widgets_gauge.obj $(OBJS)\widgets_listbox.obj $(OBJS)\widgets_notebook.obj $(OBJS)\widgets_radiobox.obj $(OBJS)\widgets_slider.obj $(OBJS)\widgets_spinbtn.obj $(OBJS)\widgets_static.obj $(OBJS)\widgets_textctrl.obj $(OBJS)\widgets_widgets.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\widgets_widgets.res | diff --git a/samples/widgets/makefile.gcc b/samples/widgets/makefile.gcc index a2242299d2..3dc938e0ab 100644 --- a/samples/widgets/makefile.gcc +++ b/samples/widgets/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -48,10 +13,13 @@ WXUNIV = 0 ### Variables: ### OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -WIDGETS_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +WIDGETS_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -153,11 +133,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe -install: all - -uninstall: - $(OBJS)\widgets.exe: $(OBJS)\widgets_button.o $(OBJS)\widgets_combobox.o $(OBJS)\widgets_gauge.o $(OBJS)\widgets_listbox.o $(OBJS)\widgets_notebook.o $(OBJS)\widgets_radiobox.o $(OBJS)\widgets_slider.o $(OBJS)\widgets_spinbtn.o $(OBJS)\widgets_static.o $(OBJS)\widgets_textctrl.o $(OBJS)\widgets_widgets.o $(OBJS)\widgets_widgets_rc.o - $(CXX) -o $@ $(OBJS)\widgets_button.o $(OBJS)\widgets_combobox.o $(OBJS)\widgets_gauge.o $(OBJS)\widgets_listbox.o $(OBJS)\widgets_notebook.o $(OBJS)\widgets_radiobox.o $(OBJS)\widgets_slider.o $(OBJS)\widgets_spinbtn.o $(OBJS)\widgets_static.o $(OBJS)\widgets_textctrl.o $(OBJS)\widgets_widgets.o $(OBJS)\widgets_widgets_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(OBJS)\widgets_button.o $(OBJS)\widgets_combobox.o $(OBJS)\widgets_gauge.o $(OBJS)\widgets_listbox.o $(OBJS)\widgets_notebook.o $(OBJS)\widgets_radiobox.o $(OBJS)\widgets_slider.o $(OBJS)\widgets_spinbtn.o $(OBJS)\widgets_static.o $(OBJS)\widgets_textctrl.o $(OBJS)\widgets_widgets.o $(OBJS)\widgets_widgets_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/widgets/makefile.vc b/samples/widgets/makefile.vc index dad00f6fa0..b35228a6dc 100644 --- a/samples/widgets/makefile.vc +++ b/samples/widgets/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -43,7 +13,7 @@ WXUNIV = 0 ### Variables: ### OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -WIDGETS_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +WIDGETS_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\widgets.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -142,18 +142,14 @@ $(OBJS)\widgets_widgets.obj: .\widgets.cpp $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $** $(OBJS)\widgets_widgets.res: .\widgets.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe -install: all - -uninstall: - $(OBJS)\widgets.exe: $(OBJS)\widgets_button.obj $(OBJS)\widgets_combobox.obj $(OBJS)\widgets_gauge.obj $(OBJS)\widgets_listbox.obj $(OBJS)\widgets_notebook.obj $(OBJS)\widgets_radiobox.obj $(OBJS)\widgets_slider.obj $(OBJS)\widgets_spinbtn.obj $(OBJS)\widgets_static.obj $(OBJS)\widgets_textctrl.obj $(OBJS)\widgets_widgets.obj $(OBJS)\widgets_widgets.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\widgets_button.obj $(OBJS)\widgets_combobox.obj $(OBJS)\widgets_gauge.obj $(OBJS)\widgets_listbox.obj $(OBJS)\widgets_notebook.obj $(OBJS)\widgets_radiobox.obj $(OBJS)\widgets_slider.obj $(OBJS)\widgets_spinbtn.obj $(OBJS)\widgets_static.obj $(OBJS)\widgets_textctrl.obj $(OBJS)\widgets_widgets.obj $(OBJS)\widgets_widgets.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\widgets_button.obj $(OBJS)\widgets_combobox.obj $(OBJS)\widgets_gauge.obj $(OBJS)\widgets_listbox.obj $(OBJS)\widgets_notebook.obj $(OBJS)\widgets_radiobox.obj $(OBJS)\widgets_slider.obj $(OBJS)\widgets_spinbtn.obj $(OBJS)\widgets_static.obj $(OBJS)\widgets_textctrl.obj $(OBJS)\widgets_widgets.obj $(OBJS)\widgets_widgets.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 68f899756b..e33c8d9a21 100644 --- a/samples/widgets/makefile.wat +++ b/samples/widgets/makefile.wat @@ -1,12 +1,177 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = widgets -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +WIDGETS_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\widgets.exe + +$(OBJS)\widgets_button.obj : .AUTODEPEND .\button.cpp + $(CXX) -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_combobox.obj : .AUTODEPEND .\combobox.cpp + $(CXX) -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_gauge.obj : .AUTODEPEND .\gauge.cpp + $(CXX) -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_listbox.obj : .AUTODEPEND .\listbox.cpp + $(CXX) -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_notebook.obj : .AUTODEPEND .\notebook.cpp + $(CXX) -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_radiobox.obj : .AUTODEPEND .\radiobox.cpp + $(CXX) -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_slider.obj : .AUTODEPEND .\slider.cpp + $(CXX) -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_spinbtn.obj : .AUTODEPEND .\spinbtn.cpp + $(CXX) -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_static.obj : .AUTODEPEND .\static.cpp + $(CXX) -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_textctrl.obj : .AUTODEPEND .\textctrl.cpp + $(CXX) -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_widgets.obj : .AUTODEPEND .\widgets.cpp + $(CXX) -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_widgets.res : .AUTODEPEND .\widgets.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe + +$(OBJS)\widgets.exe : $(OBJS)\widgets_button.obj $(OBJS)\widgets_combobox.obj $(OBJS)\widgets_gauge.obj $(OBJS)\widgets_listbox.obj $(OBJS)\widgets_notebook.obj $(OBJS)\widgets_radiobox.obj $(OBJS)\widgets_slider.obj $(OBJS)\widgets_spinbtn.obj $(OBJS)\widgets_static.obj $(OBJS)\widgets_textctrl.obj $(OBJS)\widgets_widgets.obj $(OBJS)\widgets_widgets.res + @%create $(OBJS)\widgets.lbc + @%append $(OBJS)\widgets.lbc option quiet + @%append $(OBJS)\widgets.lbc name $^@ + @%append $(OBJS)\widgets.lbc option incremental + @%append $(OBJS)\widgets.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\widgets_button.obj $(OBJS)\widgets_combobox.obj $(OBJS)\widgets_gauge.obj $(OBJS)\widgets_listbox.obj $(OBJS)\widgets_notebook.obj $(OBJS)\widgets_radiobox.obj $(OBJS)\widgets_slider.obj $(OBJS)\widgets_spinbtn.obj $(OBJS)\widgets_static.obj $(OBJS)\widgets_textctrl.obj $(OBJS)\widgets_widgets.obj) do @%append $(OBJS)\widgets.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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_widgets.res + wlink @$(OBJS)\widgets.lbc diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in index 4d45997558..fb220ddbc4 100644 --- a/samples/wizard/Makefile.in +++ b/samples/wizard/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -WIZARD_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +WIZARD_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ WIZARD_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(to @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o wizard$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o wizard$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__wizard___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__wizard___mac_setfilecmd = $(SETFILE) -a C wizard$(EXEEXT) +@COND_PLATFORM_MAC_1@__wizard___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C wizard$(EXEEXT) @COND_PLATFORM_WIN32_1@__wizard___win32rc = wizard_wizard_rc.o ### Targets: ### @@ -100,7 +127,7 @@ install-strip: install uninstall: wizard$(EXEEXT): wizard_wizard.o $(__wizard___win32rc) - $(CXX) -o $@ wizard_wizard.o $(__wizard___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ wizard_wizard.o $(__wizard___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__wizard___mac_rezcmd) $(__wizard___mac_setfilecmd) diff --git a/samples/wizard/makefile.bcc b/samples/wizard/makefile.bcc index c8c75371a5..bfaca1d819 100644 --- a/samples/wizard/makefile.bcc +++ b/samples/wizard/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -8,60 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = release -!endif -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include -!endif -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 1 -!endif -# Is this official build by wxWindows developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 1 -!endif -# Compile Unicode build of wxWindows? [0,1] -!ifndef UNICODE -UNICODE = 0 -!endif -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif +!include ../../build/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -73,8 +20,14 @@ WXUNIV = 0 ### Variables: ### -OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -WIZARD_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +WIZARD_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -97,6 +50,12 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -108,6 +67,24 @@ __DLLFLAG_p = -DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = -dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif @@ -118,10 +95,12 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib !endif !if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -143,18 +122,14 @@ $(OBJS)\wizard_wizard.obj: .\wizard.cpp $(CXX) -q -c -P -o$@ $(WIZARD_CXXFLAGS) $** $(OBJS)\wizard_wizard.res: .\wizard.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib -i./../../src/regex -i. $(__DLLFLAG_p_1) $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe -install: all - -uninstall: - $(OBJS)\wizard.exe: $(OBJS)\wizard_wizard.obj $(OBJS)\wizard_wizard.res - ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| - c0w32.obj $(OBJS)\wizard_wizard.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32.lib,, $(OBJS)\wizard_wizard.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\wizard_wizard.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\wizard_wizard.res | diff --git a/samples/wizard/makefile.gcc b/samples/wizard/makefile.gcc index 61d38c44ed..b6bdb9840a 100644 --- a/samples/wizard/makefile.gcc +++ b/samples/wizard/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -48,10 +13,13 @@ WXUNIV = 0 ### Variables: ### OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -WIZARD_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +WIZARD_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe -install: all - -uninstall: - $(OBJS)\wizard.exe: $(OBJS)\wizard_wizard.o $(OBJS)\wizard_wizard_rc.o - $(CXX) -o $@ $(OBJS)\wizard_wizard.o $(OBJS)\wizard_wizard_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(OBJS)\wizard_wizard.o $(OBJS)\wizard_wizard_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/wizard/makefile.vc b/samples/wizard/makefile.vc index feb6a13741..108d813d1f 100644 --- a/samples/wizard/makefile.vc +++ b/samples/wizard/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -43,7 +13,7 @@ WXUNIV = 0 ### Variables: ### OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -WIZARD_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +WIZARD_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\wizard.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\wizard_wizard.obj: .\wizard.cpp $(CXX) /c /nologo /TP /Fo$@ $(WIZARD_CXXFLAGS) $** $(OBJS)\wizard_wizard.res: .\wizard.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe -install: all - -uninstall: - $(OBJS)\wizard.exe: $(OBJS)\wizard_wizard.obj $(OBJS)\wizard_wizard.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\wizard_wizard.obj $(OBJS)\wizard_wizard.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\wizard_wizard.obj $(OBJS)\wizard_wizard.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 c560384ad1..5e348c12c2 100644 --- a/samples/wizard/makefile.wat +++ b/samples/wizard/makefile.wat @@ -1,12 +1,147 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# -# -# -PROGRAM = wizard -OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj -# -!include $(%WXWIN)\src\makeprog.wat +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +WIZARD_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\wizard.exe + +$(OBJS)\wizard_wizard.obj : .AUTODEPEND .\wizard.cpp + $(CXX) -zq -fo=$^@ $(WIZARD_CXXFLAGS) $< + +$(OBJS)\wizard_wizard.res : .AUTODEPEND .\wizard.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe + +$(OBJS)\wizard.exe : $(OBJS)\wizard_wizard.obj $(OBJS)\wizard_wizard.res + @%create $(OBJS)\wizard.lbc + @%append $(OBJS)\wizard.lbc option quiet + @%append $(OBJS)\wizard.lbc name $^@ + @%append $(OBJS)\wizard.lbc option incremental + @%append $(OBJS)\wizard.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\wizard_wizard.obj) do @%append $(OBJS)\wizard.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\wizard.lbc diff --git a/samples/wxtest/Makefile.in b/samples/wxtest/Makefile.in index a2a74c85f4..3d651e7bb9 100644 --- a/samples/wxtest/Makefile.in +++ b/samples/wxtest/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -WXTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) +WXTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + $(CXXFLAGS) ### Conditionally set variables: ### @@ -47,37 +52,59 @@ WXTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(to @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o wxtest$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -o wxtest$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__wxtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__wxtest___mac_setfilecmd = $(SETFILE) -a C wxtest$(EXEEXT) +@COND_PLATFORM_MAC_1@__wxtest___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C wxtest$(EXEEXT) @COND_PLATFORM_WIN32_1@__wxtest___win32rc = wxtest_wxtest_rc.o ### Targets: ### @@ -100,7 +127,7 @@ install-strip: install uninstall: wxtest$(EXEEXT): wxtest_wxtest.o $(__wxtest___win32rc) - $(CXX) -o $@ wxtest_wxtest.o $(__wxtest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ wxtest_wxtest.o $(__wxtest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__wxtest___mac_rezcmd) $(__wxtest___mac_setfilecmd) diff --git a/samples/wxtest/makefile.bcc b/samples/wxtest/makefile.bcc new file mode 100644 index 0000000000..11ce7cd6d0 --- /dev/null +++ b/samples/wxtest/makefile.bcc @@ -0,0 +1,135 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +WXTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include \ + -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \ + -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\wxtest.exe + +$(OBJS)\wxtest_wxtest.obj: .\wxtest.cpp + $(CXX) -q -c -P -o$@ $(WXTEST_CXXFLAGS) $** + +$(OBJS)\wxtest_wxtest.res: .\wxtest.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\src\tiff -i.\..\..\src\jpeg -i.\..\..\src\png -i.\..\..\src\zlib -i.\..\..\src\regex -i. $(__DLLFLAG_p_1) $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\wxtest.exe del $(OBJS)\wxtest.exe + +$(OBJS)\wxtest.exe: $(OBJS)\wxtest_wxtest.obj $(OBJS)\wxtest_wxtest.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\wxtest_wxtest.obj,$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\wxtest_wxtest.res +| diff --git a/samples/wxtest/makefile.gcc b/samples/wxtest/makefile.gcc index 92c177a98b..18d3bf7ab2 100644 --- a/samples/wxtest/makefile.gcc +++ b/samples/wxtest/makefile.gcc @@ -1,45 +1,10 @@ - # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = -# C++ compiler -CXX = g++ -# Standard flags for C++ -CXXFLAGS = -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer that cames with gcc3 -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION = 3 -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +include ../../build/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -48,10 +13,13 @@ WXUNIV = 0 ### Variables: ### OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -WXTEST_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS) +WXTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif ifeq ($(USE_GUI),0) PORTNAME = base endif @@ -71,6 +39,12 @@ ifeq ($(WXUNIV),1) WXUNIVNAME = univ endif ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) __DEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(BUILD),debug) @@ -82,6 +56,12 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 endif @@ -123,11 +103,7 @@ clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\wxtest.exe del $(OBJS)\wxtest.exe -install: all - -uninstall: - $(OBJS)\wxtest.exe: $(OBJS)\wxtest_wxtest.o $(OBJS)\wxtest_wxtest_rc.o - $(CXX) -o $@ $(OBJS)\wxtest_wxtest.o $(OBJS)\wxtest_wxtest_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(OBJS)\wxtest_wxtest.o $(OBJS)\wxtest_wxtest_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -.PHONY: all +.PHONY: all clean diff --git a/samples/wxtest/makefile.vc b/samples/wxtest/makefile.vc index 752435b66c..5aa0133e3c 100644 --- a/samples/wxtest/makefile.vc +++ b/samples/wxtest/makefile.vc @@ -1,40 +1,10 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Type of compiled binaries [debug,release] -BUILD = release -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = /DWIN32 /D_WINDOWS -# C++ compiler -CXX = cl -# Standard flags for C++ -CXXFLAGS = -# Standard linker flags -LDFLAGS = -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 1 -# Is this official build by wxWindows developers? [0,1] -OFFICIAL_BUILD = 0 -# What type of library to build? [0,1] -SHARED = 1 -# Compile Unicode build of wxWindows? [0,1] -UNICODE = 0 -# Build GUI libraries? [0,1] -USE_GUI = 1 -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 +!include <../../build/config.vc> # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -43,7 +13,7 @@ WXUNIV = 0 ### Variables: ### OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -WXTEST_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS) +WXTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\wxtest.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS) ### Conditionally set variables: ### @@ -66,6 +36,24 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(BUILD)" == "debug" @@ -77,6 +65,18 @@ __DLLFLAG_p = /DWXUSINGDLL !if "$(SHARED)" == "1" __DLLFLAG_p_1 = /dWXUSINGDLL !endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 !endif @@ -112,18 +112,14 @@ $(OBJS)\wxtest_wxtest.obj: .\wxtest.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXTEST_CXXFLAGS) $** $(OBJS)\wxtest_wxtest.res: .\wxtest.rc - rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib /i./../../src/regex /i. $(__DLLFLAG_p_1) $** + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $** clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\wxtest.exe del $(OBJS)\wxtest.exe -install: all - -uninstall: - $(OBJS)\wxtest.exe: $(OBJS)\wxtest_wxtest.obj $(OBJS)\wxtest_wxtest.res - link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< - $(OBJS)\wxtest_wxtest.obj $(OBJS)\wxtest_wxtest.res $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\wxtest_wxtest.obj $(OBJS)\wxtest_wxtest.res $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib << diff --git a/samples/wxtest/makefile.wat b/samples/wxtest/makefile.wat new file mode 100644 index 0000000000..9374bfdc36 --- /dev/null +++ b/samples/wxtest/makefile.wat @@ -0,0 +1,147 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +WXTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\wxtest.exe + +$(OBJS)\wxtest_wxtest.obj : .AUTODEPEND .\wxtest.cpp + $(CXX) -zq -fo=$^@ $(WXTEST_CXXFLAGS) $< + +$(OBJS)\wxtest_wxtest.res : .AUTODEPEND .\wxtest.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\wxtest.exe del $(OBJS)\wxtest.exe + +$(OBJS)\wxtest.exe : $(OBJS)\wxtest_wxtest.obj $(OBJS)\wxtest_wxtest.res + @%create $(OBJS)\wxtest.lbc + @%append $(OBJS)\wxtest.lbc option quiet + @%append $(OBJS)\wxtest.lbc name $^@ + @%append $(OBJS)\wxtest.lbc option incremental + @%append $(OBJS)\wxtest.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\wxtest_wxtest.obj) do @%append $(OBJS)\wxtest.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\wxtest.lbc library %i + @%append $(OBJS)\wxtest.lbc option resource=$(OBJS)\wxtest_wxtest.res + wlink @$(OBJS)\wxtest.lbc diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in index 1f19d33627..02954952ed 100644 --- a/samples/xrc/Makefile.in +++ b/samples/xrc/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -16,11 +16,13 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SETFILE = @SETFILE@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -30,7 +32,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -XRCDEMO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../include $(CXXFLAGS) +XRCDEMO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) \ + -I$(srcdir)/../../include $(CXXFLAGS) ### Conditionally set variables: ### @@ -44,33 +49,66 @@ XRCDEMO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(t @COND_WXUNIV_1@WXUNIVNAME = univ @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \ +@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \ +@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \ +@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i $(srcdir)/../../include -o xrcdemo$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_0@__WXLIB_HTML_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \ +@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ +@COND_TOOLKIT_MAC@ __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ +@COND_TOOLKIT_MAC@ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ +@COND_TOOLKIT_MAC@ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ +@COND_TOOLKIT_MAC@ $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i \ +@COND_TOOLKIT_MAC@ $(srcdir) $(__DLLFLAG_p_1) -i $(srcdir)/../../include -o \ +@COND_TOOLKIT_MAC@ xrcdemo$(EXEEXT) Carbon.r \ +@COND_TOOLKIT_MAC@ $(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_HTML_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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_PLATFORM_MAC_1@__xrcdemo___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__xrcdemo___mac_setfilecmd = $(SETFILE) -a C xrcdemo$(EXEEXT) +@COND_PLATFORM_MAC_1@__xrcdemo___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C xrcdemo$(EXEEXT) +@COND_PLATFORM_WIN32_1@__xrcdemo___win32rc = xrcdemo_xrcdemo_rc.o ### Targets: ### @@ -99,8 +137,8 @@ install-strip: install uninstall: -xrcdemo$(EXEEXT): xrcdemo_xrcdemo.o xrcdemo_myframe.o xrcdemo_derivdlg.o xrcdemo_custclas.o - $(CXX) -o $@ xrcdemo_xrcdemo.o xrcdemo_myframe.o xrcdemo_derivdlg.o xrcdemo_custclas.o $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5 $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) +xrcdemo$(EXEEXT): xrcdemo_xrcdemo.o xrcdemo_myframe.o xrcdemo_derivdlg.o xrcdemo_custclas.o $(__xrcdemo___win32rc) + $(CXX) -o $@ xrcdemo_xrcdemo.o xrcdemo_myframe.o xrcdemo_derivdlg.o xrcdemo_custclas.o $(__xrcdemo___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__xrcdemo___mac_rezcmd) $(__xrcdemo___mac_setfilecmd) @@ -116,6 +154,9 @@ xrcdemo_myframe.o: $(srcdir)/myframe.cpp xrcdemo_xrcdemo.o: $(srcdir)/xrcdemo.cpp $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $< +xrcdemo_xrcdemo_rc.o: $(srcdir)/xrcdemo.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../include + # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d diff --git a/samples/xrc/makefile.bcc b/samples/xrc/makefile.bcc new file mode 100644 index 0000000000..4c792175fa --- /dev/null +++ b/samples/xrc/makefile.bcc @@ -0,0 +1,153 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!ifndef BCCDIR +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +!if "$(BCCDIR)" == "\.." +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif + +### Variables: ### + +OBJS = \ + bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ + $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ + -I.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \ + -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \ + -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) \ + -I.\..\..\include $(CXXFLAGS) + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG = -v +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG = -v- +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = -D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\xrcdemo.exe data + +$(OBJS)\xrcdemo_custclas.obj: .\custclas.cpp + $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) $** + +$(OBJS)\xrcdemo_derivdlg.obj: .\derivdlg.cpp + $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) $** + +$(OBJS)\xrcdemo_myframe.obj: .\myframe.cpp + $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) $** + +$(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp + $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) $** + +$(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib -i.\..\..\..\src\regex -i. $(__DLLFLAG_p_1) -i.\..\..\include $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe + +data: + if not exist $(OBJS)/rc mkdir $(OBJS)/rc + for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%f copy ./rc\%f $(OBJS)/rc + +$(OBJS)\xrcdemo.exe: $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj $(OBJS)\xrcdemo_xrcdemo.res + ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG) -L.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa @&&| + c0w32.obj $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj,$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\xrcdemo_xrcdemo.res +| diff --git a/samples/xrc/makefile.gcc b/samples/xrc/makefile.gcc new file mode 100644 index 0000000000..322d630f09 --- /dev/null +++ b/samples/xrc/makefile.gcc @@ -0,0 +1,125 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS) + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(BUILD),debug) +__DEBUGFLAG = -g +endif +ifeq ($(BUILD),release) +__DEBUGFLAG = +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p = -D__WXDEBUG__ +endif +ifeq ($(BUILD),debug) +__DEBUG_DEFINE_p_1 = --define __WXDEBUG__ +endif +ifeq ($(SHARED),1) +__DLLFLAG_p = -DWXUSINGDLL +endif +ifeq ($(SHARED),1) +__DLLFLAG_p_1 = --define WXUSINGDLL +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1 +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_HTML_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\xrcdemo.exe data + +$(OBJS)\xrcdemo_custclas.o: .\custclas.cpp + $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $< + +$(OBJS)\xrcdemo_derivdlg.o: .\derivdlg.cpp + $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $< + +$(OBJS)\xrcdemo_myframe.o: .\myframe.cpp + $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $< + +$(OBJS)\xrcdemo_xrcdemo.o: .\xrcdemo.cpp + $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $< + +$(OBJS)\xrcdemo_xrcdemo_rc.o: .\xrcdemo.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir ./../../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib --include-dir ./../../../src/regex --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../include + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe + +data: + if not exist $(OBJS)/rc mkdir $(OBJS)/rc + for %%f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%%f copy ./rc\%%f $(OBJS)/rc + +$(OBJS)\xrcdemo.exe: $(OBJS)\xrcdemo_xrcdemo.o $(OBJS)\xrcdemo_myframe.o $(OBJS)\xrcdemo_derivdlg.o $(OBJS)\xrcdemo_custclas.o $(OBJS)\xrcdemo_xrcdemo_rc.o + $(CXX) -o $@ $(OBJS)\xrcdemo_xrcdemo.o $(OBJS)\xrcdemo_myframe.o $(OBJS)\xrcdemo_derivdlg.o $(OBJS)\xrcdemo_custclas.o $(OBJS)\xrcdemo_xrcdemo_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + +.PHONY: all clean diff --git a/samples/xrc/makefile.vc b/samples/xrc/makefile.vc index 42fea985a3..69bd7e91ce 100644 --- a/samples/xrc/makefile.vc +++ b/samples/xrc/makefile.vc @@ -1,16 +1,141 @@ -# File: makefile.vc For stectrl -# Author: Robin Dunn -# Created: 1-Feb-2000 -# Updated: +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= -WXDIR = $(WXWIN) -PROGRAM = xrcdemo +!include <../../../build/config.vc> -OBJECTS = $(PROGRAM).obj myframe.obj derivdlg.obj custclas.obj +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- -EXTRALIBS = $(WXDIR)\lib\wxxrc$(LIBEXT).lib -EXTRAINC = -I$(WXDIR)\contrib\include +### Variables: ### -!include $(WXDIR)\src\makeprog.vc +OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +XRCDEMO_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\xrcdemo.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I. $(__DLLFLAG_p) /I.\..\..\include $(CXXFLAGS) +### Conditionally set variables: ### +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_0 = /Zi +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_0 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_1 = +!endif +!if "$(BUILD)" == "debug" +__DEBUGFLAG_2 = d +!endif +!if "$(BUILD)" == "release" +__DEBUGFLAG_2 = +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(BUILD)" == "debug" +__DEBUG_DEFINE_p_1 = /d__WXDEBUG__ +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /dWXUSINGDLL +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_3 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_3 = /O2 +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_6 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_6 = +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__ +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\xrcdemo.exe data + +$(OBJS)\xrcdemo_custclas.obj: .\custclas.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) $** + +$(OBJS)\xrcdemo_derivdlg.obj: .\derivdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) $** + +$(OBJS)\xrcdemo_myframe.obj: .\myframe.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) $** + +$(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) $** + +$(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc + rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\..\include /i.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\..\src\tiff /i.\..\..\..\src\jpeg /i.\..\..\..\src\png /i.\..\..\..\src\zlib /i.\..\..\..\src\regex /i. $(__DLLFLAG_p_1) /i.\..\..\include $** + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe + +data: + if not exist $(OBJS)/rc mkdir $(OBJS)/rc + for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%f copy ./rc\%f $(OBJS)/rc + +$(OBJS)\xrcdemo.exe: $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj $(OBJS)\xrcdemo_xrcdemo.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<< + $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj $(OBJS)\xrcdemo_xrcdemo.res wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 new file mode 100644 index 0000000000..4460c9e42d --- /dev/null +++ b/samples/xrc/makefile.wat @@ -0,0 +1,164 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! loaddll wlink wlink +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +__DEBUGFLAG_0 = +!ifeq BUILD debug +__DEBUGFLAG_0 = -d2 +!endif +!ifeq BUILD release +__DEBUGFLAG_0 = -d0 +!endif +__DEBUGFLAG_1 = +!ifeq BUILD debug +__DEBUGFLAG_1 = debug all +!endif +!ifeq BUILD release +__DEBUGFLAG_1 = +!endif +__DEBUG_DEFINE_p = +!ifeq BUILD debug +__DEBUG_DEFINE_p = -d__WXDEBUG__ +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__RUNTIME_LIBS_5 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_5 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_5 = +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif + +### Variables: ### + +OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=. $(__DLLFLAG_p) -i=.\..\..\include $(CXXFLAGS) + + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\xrcdemo.exe data + +$(OBJS)\xrcdemo_custclas.obj : .AUTODEPEND .\custclas.cpp + $(CXX) -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< + +$(OBJS)\xrcdemo_derivdlg.obj : .AUTODEPEND .\derivdlg.cpp + $(CXX) -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< + +$(OBJS)\xrcdemo_myframe.obj : .AUTODEPEND .\myframe.cpp + $(CXX) -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< + +$(OBJS)\xrcdemo_xrcdemo.obj : .AUTODEPEND .\xrcdemo.cpp + $(CXX) -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< + +$(OBJS)\xrcdemo_xrcdemo.res : .AUTODEPEND .\xrcdemo.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=. $(__DLLFLAG_p) -i=.\..\..\include $< + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe + +data : + if not exist $(OBJS)/rc mkdir $(OBJS)/rc + for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%f copy ./rc\%f $(OBJS)/rc + +$(OBJS)\xrcdemo.exe : $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj $(OBJS)\xrcdemo_xrcdemo.res + @%create $(OBJS)\xrcdemo.lbc + @%append $(OBJS)\xrcdemo.lbc option quiet + @%append $(OBJS)\xrcdemo.lbc name $^@ + @%append $(OBJS)\xrcdemo.lbc option incremental + @%append $(OBJS)\xrcdemo.lbc $(LDFLAGS) $(__DEBUGFLAG_1) libpath .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' + @for %i in ( $(OBJS)\xrcdemo_xrcdemo.obj $(OBJS)\xrcdemo_myframe.obj $(OBJS)\xrcdemo_derivdlg.obj $(OBJS)\xrcdemo_custclas.obj) do @%append $(OBJS)\xrcdemo.lbc file %i + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.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 + wlink @$(OBJS)\xrcdemo.lbc diff --git a/src/stc/Makefile.in b/src/stc/Makefile.in index ff006759dc..83b6453227 100644 --- a/src/stc/Makefile.in +++ b/src/stc/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/src/xrc/Makefile.in b/src/xrc/Makefile.in index d69453304a..650d9e2c53 100644 --- a/src/xrc/Makefile.in +++ b/src/xrc/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -19,6 +19,7 @@ CXXFLAGS = @CXXFLAGS@ DLLPREFIX = @DLLPREFIX@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +HOST_SUFFIX = @HOST_SUFFIX@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_DIR = @INSTALL_DIR@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -42,10 +43,24 @@ top_srcdir = @top_srcdir@ ### Variables: ### -XRCDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_XRC -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) -XRCDLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_XRC -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) $(PIC_FLAG) -XRCLIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) -XRCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) +XRCDLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include \ + -DWXUSINGDLL -DWXMAKINGDLL_XRC -I$(srcdir)/expat/xmlparse \ + -I$(srcdir)/expat/xmltok $(CFLAGS) $(PIC_FLAG) +XRCDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include \ + -DWXUSINGDLL -DWXMAKINGDLL_XRC -I$(srcdir)/expat/xmlparse \ + -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) +XRCLIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include \ + -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) +XRCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include \ + -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) ### Conditionally set variables: ### @@ -74,39 +89,76 @@ XRCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(to @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) -@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_MONOLITHIC_0@__WXLIB_HTML_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 -@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ +@COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ +@COND_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ +@COND_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ +@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_HTML_p = \ +@COND_MONOLITHIC_0@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = \ +@COND_MONOLITHIC_1@ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_SHARED_1@__install_xrcdll___depname = install_xrcdll @COND_SHARED_0@__install_xrclib___depname = install_xrclib -@COND_SHARED_1@__xrcdll___depname = $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) -@COND_PLATFORM_WIN32_1@__xrcdll___importlib = -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) -@COND_PLATFORM_WIN32_1@__xrcdll___importlib = -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) -@COND_PLATFORM_MACOSX_1@__xrcdll___macinstnamecmd = -install_name $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) -@COND_PLATFORM_MACOSX_1@__xrcdll___macver = -compatibility_version 2.5 -current_version 2.5.0 -@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_cmd = rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) -@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd = rm -f libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) -@COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) -@COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__xrcdll___targetsuf2 = .$(SO_SUFFIX).0 -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf2 = .0.$(SO_SUFFIX) +@COND_SHARED_1@__xrcdll___depname = \ +@COND_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) +@COND_PLATFORM_WIN32_1@__xrcdll___importlib = \ +@COND_PLATFORM_WIN32_1@ -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__xrcdll___importlib = \ +@COND_PLATFORM_WIN32_1@ -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_MACOSX_1@__xrcdll___macinstnamecmd = \ +@COND_PLATFORM_MACOSX_1@ -install_name \ +@COND_PLATFORM_MACOSX_1@ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__xrcdll___macver = \ +@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.5 -current_version 2.5.0 +@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_cmd = \ +@COND_USE_SOSYMLINKS_1@ rm -f \ +@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ +@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \ +@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \ +@COND_USE_SOSYMLINKS_1@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd \ +@COND_USE_SOSYMLINKS_1@ = rm -f \ +@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) \ +@COND_USE_SOSYMLINKS_1@ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \ +@COND_USE_SOSYMLINKS_1@ libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = \ +@COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) +@COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = \ +@COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__xrcdll___targetsuf2 \ +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf2 \ +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__xrcdll___targetsuf2 = .$(SO_SUFFIX) -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__xrcdll___targetsuf3 = .$(SO_SUFFIX).0.0.0 -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf3 = .0.0.0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__xrcdll___targetsuf3 \ +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf3 \ +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__xrcdll___targetsuf3 = .$(SO_SUFFIX) -@COND_SHARED_0@__xrclib___depname = $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a +@COND_SHARED_0@__xrclib___depname = \ +@COND_SHARED_0@ $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a ### Targets: ### @@ -116,9 +168,9 @@ clean: rm -rf ./.deps rm -f -f ./*.o rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a + rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) + rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a distclean: clean rm -f configure config.cache config.log config.status @@ -138,13 +190,13 @@ install-strip: install @COND_SHARED_1@install_xrcdll: @COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(libdir) +@COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) @COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(libdir) @COND_SHARED_1@ (cd $(libdir) ; $(__xrcdll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_xrclib: @COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a $(libdir) +@COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a $(libdir) uninstall: @@ -275,7 +327,7 @@ xrcdll_xmlrsall.o: $(srcdir)/xmlrsall.cpp xrcdll_xmltok.o: $(srcdir)/expat/xmltok/xmltok.c $(CCC) -c -o $@ $(XRCDLL_CFLAGS) $< -@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a: xrclib_xmlparse.o xrclib_xmltok.o xrclib_xmlrole.o xrclib_xml.o xrclib_xmlres.o xrclib_xh_bmp.o xrclib_xh_bmpbt.o xrclib_xh_bttn.o xrclib_xh_cald.o xrclib_xh_chckb.o xrclib_xh_chckl.o xrclib_xh_choic.o xrclib_xh_combo.o xrclib_xh_dlg.o xrclib_xh_frame.o xrclib_xh_gauge.o xrclib_xh_gdctl.o xrclib_xh_html.o xrclib_xh_listb.o xrclib_xh_listc.o xrclib_xh_menu.o xrclib_xh_notbk.o xrclib_xh_panel.o xrclib_xh_radbt.o xrclib_xh_radbx.o xrclib_xh_scrol.o xrclib_xh_scwin.o xrclib_xh_sizer.o xrclib_xh_slidr.o xrclib_xh_spin.o xrclib_xh_split.o xrclib_xh_stbmp.o xrclib_xh_stbox.o xrclib_xh_stlin.o xrclib_xh_sttxt.o xrclib_xh_text.o xrclib_xh_toolb.o xrclib_xh_tree.o xrclib_xh_unkwn.o xrclib_xh_wizrd.o xrclib_xmlrsall.o +@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a: xrclib_xmlparse.o xrclib_xmltok.o xrclib_xmlrole.o xrclib_xml.o xrclib_xmlres.o xrclib_xh_bmp.o xrclib_xh_bmpbt.o xrclib_xh_bttn.o xrclib_xh_cald.o xrclib_xh_chckb.o xrclib_xh_chckl.o xrclib_xh_choic.o xrclib_xh_combo.o xrclib_xh_dlg.o xrclib_xh_frame.o xrclib_xh_gauge.o xrclib_xh_gdctl.o xrclib_xh_html.o xrclib_xh_listb.o xrclib_xh_listc.o xrclib_xh_menu.o xrclib_xh_notbk.o xrclib_xh_panel.o xrclib_xh_radbt.o xrclib_xh_radbx.o xrclib_xh_scrol.o xrclib_xh_scwin.o xrclib_xh_sizer.o xrclib_xh_slidr.o xrclib_xh_spin.o xrclib_xh_split.o xrclib_xh_stbmp.o xrclib_xh_stbox.o xrclib_xh_stlin.o xrclib_xh_sttxt.o xrclib_xh_text.o xrclib_xh_toolb.o xrclib_xh_tree.o xrclib_xh_unkwn.o xrclib_xh_wizrd.o xrclib_xmlrsall.o @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ xrclib_xmlparse.o xrclib_xmltok.o xrclib_xmlrole.o xrclib_xml.o xrclib_xmlres.o xrclib_xh_bmp.o xrclib_xh_bmpbt.o xrclib_xh_bttn.o xrclib_xh_cald.o xrclib_xh_chckb.o xrclib_xh_chckl.o xrclib_xh_choic.o xrclib_xh_combo.o xrclib_xh_dlg.o xrclib_xh_frame.o xrclib_xh_gauge.o xrclib_xh_gdctl.o xrclib_xh_html.o xrclib_xh_listb.o xrclib_xh_listc.o xrclib_xh_menu.o xrclib_xh_notbk.o xrclib_xh_panel.o xrclib_xh_radbt.o xrclib_xh_radbx.o xrclib_xh_scrol.o xrclib_xh_scwin.o xrclib_xh_sizer.o xrclib_xh_slidr.o xrclib_xh_spin.o xrclib_xh_split.o xrclib_xh_stbmp.o xrclib_xh_stbox.o xrclib_xh_stlin.o xrclib_xh_sttxt.o xrclib_xh_text.o xrclib_xh_toolb.o xrclib_xh_tree.o xrclib_xh_unkwn.o xrclib_xh_wizrd.o xrclib_xmlrsall.o @COND_SHARED_0@ $(RANLIB) $@ -- 2.45.2