Adapted printing samples makefiles.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2004-11-01 23:07:49 +00:00
parent 7fcba069d8
commit 7b25d8e7bd
3 changed files with 10 additions and 1 deletions

View File

@@ -29,6 +29,8 @@ TOOLKIT_VERSION = @TOOLKIT_VERSION@
TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
EXTRALIBS = @EXTRALIBS@ EXTRALIBS = @EXTRALIBS@
EXTRALIBS_GUI = @EXTRALIBS_GUI@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
EXTRALIBS_SDL = @EXTRALIBS_SDL@
EXTRALIBS_GNOMEPRINT = @EXTRALIBS_GNOMEPRINT@
HOST_SUFFIX = @HOST_SUFFIX@ HOST_SUFFIX = @HOST_SUFFIX@
SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
@@ -50,6 +52,8 @@ PRINTING_OBJECTS = \
@COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_0@CXXC = $(CXX)
@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = \
@COND_USE_PLUGINS_0@ $(EXTRALIBS_SDL) $(EXTRALIBS_GNOMEPRINT)
@COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -80,6 +84,9 @@ COND_PLATFORM_OS2_1___printing___os2_emxbindcmd = $(NM) printing$(EXEEXT) | if \
@COND_TOOLKIT_COCOA@ printing.app/Contents/PkgInfo @COND_TOOLKIT_COCOA@ printing.app/Contents/PkgInfo
@COND_TOOLKIT_MAC@____printing_BUNDLE_TGT_REF_DEP = \ @COND_TOOLKIT_MAC@____printing_BUNDLE_TGT_REF_DEP = \
@COND_TOOLKIT_MAC@ printing.app/Contents/PkgInfo @COND_TOOLKIT_MAC@ printing.app/Contents/PkgInfo
COND_MONOLITHIC_0___WXLIB_ADV_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
COND_MONOLITHIC_0___WXLIB_CORE_p = \ COND_MONOLITHIC_0___WXLIB_CORE_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -134,7 +141,7 @@ distclean: clean
rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc) printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc)
$(CXX) -o $@ $(PRINTING_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(CXX) -o $@ $(PRINTING_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI)
$(__printing___mac_rezcmd) $(__printing___mac_rezcmd)
$(__printing___mac_setfilecmd) $(__printing___mac_setfilecmd)
$(__printing___os2_emxbindcmd) $(__printing___os2_emxbindcmd)

View File

@@ -5,6 +5,7 @@
<exe id="printing" template="wx_sample" template_append="wx_append"> <exe id="printing" template="wx_sample" template_append="wx_append">
<sources>printing.cpp</sources> <sources>printing.cpp</sources>
<wx-lib>adv</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<win32-res>printing.rc</win32-res> <win32-res>printing.rc</win32-res>

View File

@@ -68,6 +68,7 @@ bool WritePageHeader(wxPrintout *printout, wxDC *dc, wxChar *text, float mmToLog
// The `main program' equivalent, creating the windows and returning the // The `main program' equivalent, creating the windows and returning the
// main frame // main frame
bool MyApp::OnInit(void) bool MyApp::OnInit(void)
{ {
m_testFont.Create(10, wxSWISS, wxNORMAL, wxNORMAL); m_testFont.Create(10, wxSWISS, wxNORMAL, wxNORMAL);