misc fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
parent
fcab04720d
commit
9c743a7c78
182
samples/render/Makefile.in
Normal file
182
samples/render/Makefile.in
Normal file
@ -0,0 +1,182 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
|
||||
@MAKE_SET@
|
||||
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
INSTALL = @INSTALL@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
DLLPREFIX_MODULE = @DLLPREFIX_MODULE@
|
||||
EXEEXT = @EXEEXT@
|
||||
EXTRALIBS = @EXTRALIBS@
|
||||
EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
||||
HOST_SUFFIX = @HOST_SUFFIX@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LDFLAGS_GUI = @LDFLAGS_GUI@
|
||||
PIC_FLAG = @PIC_FLAG@
|
||||
RESCOMP = @RESCOMP@
|
||||
SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
|
||||
SETFILE = @SETFILE@
|
||||
SHARED_LD_MODULE_CXX = @SHARED_LD_MODULE_CXX@
|
||||
SO_SUFFIX_MODULE = @SO_SUFFIX_MODULE@
|
||||
TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
|
||||
TOOLKIT = @TOOLKIT@
|
||||
TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
|
||||
TOOLKIT_VERSION = @TOOLKIT_VERSION@
|
||||
srcdir = @srcdir@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
|
||||
### Variables: ###
|
||||
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
RENDDLL_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) $(__INC_EXPAT_p) \
|
||||
-DWXUSINGDLL $(CXXFLAGS) $(PIC_FLAG)
|
||||
RENDDLL_OBJECTS = \
|
||||
renddll_renddll.o
|
||||
RENDER_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) $(__INC_EXPAT_p) \
|
||||
-I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS)
|
||||
RENDER_OBJECTS = \
|
||||
$(__render___win32rc) \
|
||||
render_render.o
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
@COND_DEPS_TRACKING_0@CXXC = $(CXX)
|
||||
@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
|
||||
@COND_PLATFORM_UNIX_0@PLUGIN_VERSION = 250
|
||||
@COND_PLATFORM_UNIX_1@PLUGIN_VERSION = -2.5.0
|
||||
@COND_USE_GUI_0@PORTNAME = base
|
||||
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
|
||||
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
|
||||
@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
|
||||
@COND_DEBUG_FLAG_1@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_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib
|
||||
@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p_1 = -i $(top_srcdir)/src/expat/lib
|
||||
@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p_2 = \
|
||||
@COND_WXUSE_EXPAT_BUILTIN@ --include-dir $(top_srcdir)/src/expat/lib
|
||||
@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_EXPAT_BUILTIN@__LIB_EXPAT_p = \
|
||||
@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
|
||||
@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
|
||||
@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
|
||||
@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
|
||||
@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
|
||||
@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
|
||||
@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
|
||||
@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
|
||||
@COND_USE_GUI_1_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 __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) $(__INC_EXPAT_p_1) -i $(srcdir) \
|
||||
$(__DLLFLAG_p_1) -o render$(EXEEXT) Carbon.r \
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r
|
||||
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
|
||||
@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
|
||||
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
|
||||
COND_MONOLITHIC_0___WXLIB_CORE_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
|
||||
COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
|
||||
COND_SHARED_1___renddll___depname = \
|
||||
$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGIN_VERSION).$(SO_SUFFIX_MODULE)
|
||||
@COND_SHARED_1@__renddll___depname = $(COND_SHARED_1___renddll___depname)
|
||||
@COND_PLATFORM_MAC_1@__render___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
|
||||
@COND_PLATFORM_MAC_1@__render___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C render$(EXEEXT)
|
||||
@COND_PLATFORM_WIN32_1@__render___win32rc = render_sample_rc.o
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: render$(EXEEXT) $(__renddll___depname)
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps
|
||||
rm -f ./*.o
|
||||
rm -f render$(EXEEXT)
|
||||
rm -f $(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGIN_VERSION).$(SO_SUFFIX_MODULE)
|
||||
|
||||
distclean: clean
|
||||
rm -f configure config.cache config.log config.status
|
||||
rm -f bk-deps shared-ld-sh
|
||||
|
||||
install: all
|
||||
|
||||
install-strip: install
|
||||
|
||||
@COND_SHARED_1@$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGIN_VERSION).$(SO_SUFFIX_MODULE): $(RENDDLL_OBJECTS)
|
||||
@COND_SHARED_1@ $(SHARED_LD_MODULE_CXX) $@ $(RENDDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
|
||||
|
||||
renddll_renddll.o: $(srcdir)/renddll.cpp
|
||||
$(CXXC) -c -o $@ $(RENDDLL_CXXFLAGS) $<
|
||||
|
||||
render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc)
|
||||
$(CXX) -o $@ $(RENDER_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) $(EXTRALIBS_GUI)
|
||||
$(__render___mac_rezcmd)
|
||||
$(__render___mac_setfilecmd)
|
||||
|
||||
render_render.o: $(srcdir)/render.cpp
|
||||
$(CXXC) -c -o $@ $(RENDER_CXXFLAGS) $<
|
||||
|
||||
render_sample_rc.o: $(srcdir)/../../samples/sample.rc
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2)
|
||||
|
||||
uninstall:
|
||||
|
||||
|
||||
# Include dependency info, if present:
|
||||
@IF_GNU_MAKE@-include .deps/*.d
|
||||
|
||||
.PHONY: all clean distclean install uninstall
|
||||
@ -11,6 +11,10 @@
|
||||
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#ifdef __BORLANDC__
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#include "wx/renderer.h"
|
||||
|
||||
class MyDllRenderer : public wxRendererNative
|
||||
|
||||
@ -9,17 +9,12 @@
|
||||
<sources>render.cpp</sources>
|
||||
<wx-lib>core</wx-lib>
|
||||
<wx-lib>base</wx-lib>
|
||||
<win32-res>../sample.rc</win32-res>
|
||||
<mac-res>../sample.r</mac-res>
|
||||
</exe>
|
||||
|
||||
<module id="renddll" cond="SHARED=='1'"
|
||||
template="wx" template_append="wx_append">
|
||||
<dllname>renddll_$(PORTNAME)$(WXUNIVNAME)$(WXWIN32DLLVERSION)</dllname>
|
||||
<define>WXUSINGDLL</define>
|
||||
<wx-gui-plugin id="renddll" cond="SHARED=='1'" template_append="wx_append">
|
||||
<sources>renddll.cpp</sources>
|
||||
<wx-lib>core</wx-lib>
|
||||
<wx-lib>base</wx-lib>
|
||||
</module>
|
||||
</wx-gui-plugin>
|
||||
|
||||
</makefile>
|
||||
|
||||
@ -27,6 +27,13 @@
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/app.h"
|
||||
#include "wx/frame.h"
|
||||
#include "wx/dc.h"
|
||||
#include "wx/dcclient.h"
|
||||
#include "wx/panel.h"
|
||||
#include "wx/menu.h"
|
||||
#include "wx/textdlg.h"
|
||||
#include "wx/log.h"
|
||||
#include "wx/msgdlg.h"
|
||||
#endif
|
||||
|
||||
#include "wx/apptrait.h"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user