regenerated

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-06-29 00:43:30 +00:00
parent a03675d9ba
commit fcf61db4d1
76 changed files with 6579 additions and 3046 deletions

View File

@@ -55,11 +55,13 @@ PLATFORM_WIN32 = @PLATFORM_WIN32@
USE_MACVERSION = @USE_MACVERSION@
PLATFORM_MACOSX = @PLATFORM_MACOSX@
DEPS_TRACKING = @DEPS_TRACKING@
OFFICIAL_BUILD = @OFFICIAL_BUILD@
UNICODE = @UNICODE@
WXUNIV = @WXUNIV@
TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
CXX = @CXX@
SHARED_LD_CXX = @SHARED_LD_CXX@
VENDOR = @VENDOR@
TOOLKIT_VERSION = @TOOLKIT_VERSION@
includedir = @includedir@
LN_S = @LN_S@
@@ -70,11 +72,18 @@ USE_SOVERLINUX = @USE_SOVERLINUX@
top_builddir = @top_builddir@
SHARED_LD_CC = @SHARED_LD_CC@
### Variables: ###
MINIMAL_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) $(__DLLFLAG_p) $(CFLAGS)
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_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG)
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_BUILD_DEBUG@WXDEBUGFLAG = d
@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5
@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(srcdir)/src/jpeg
@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng$(WXDEBUGFLAG)
@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(srcdir)/src/zlib
@@ -83,14 +92,15 @@ SHARED_LD_CC = @SHARED_LD_CC@
@COND_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib
@COND_BUILD_DEBUG@OPTIMIZEFLAG = off
@COND_BUILD_RELEASE@OPTIMIZEFLAG = speed
@COND_PLATFORM_WIN32_1@__minimal___win32rc = minimal_rc.o
@COND_PLATFORM_WIN32_1@__minimal___win32rc = minimal-minimal_rc.o
@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)
@COND_DEPS_TRACKING_0@CCC = $(CC)
@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib
@COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a
@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX)
@COND_PLATFORM_MAC_1@__minimal___mac_setfilecmd = $(SETFILE) -a C minimal$(EXEEXT)
@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib
@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc$(WXDEBUGFLAG)
@@ -110,6 +120,8 @@ SHARED_LD_CC = @SHARED_LD_CC@
@COND_PLATFORM_UNIX_1@TIFF_PLATFORM_SRC = src/tiff/tif_unix.c
@COND_PLATFORM_MACOSX_1@TIFF_PLATFORM_SRC = src/tiff/tif_unix.c
@COND_PLATFORM_WIN32_1@TIFF_PLATFORM_SRC = src/tiff/tif_win32.c
@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)25
@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
@COND_WXUSE_LIBPNG_BUILTIN@INC_PNG = $(srcdir)/src/png
@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(srcdir)/src/odbc
@@ -121,13 +133,16 @@ SHARED_LD_CC = @SHARED_LD_CC@
@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib$(WXDEBUGFLAG)
@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(srcdir)/src/regex
@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wx25
@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx
@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(srcdir)/src/tiff
@COND_WXUSE_LIBTIFF_BUILTIN@INC_TIFF = $(srcdir)/src/tiff
@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5
@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__
@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
@COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
@COND_OFFICIAL_BUILD_1@VENDORTAG =
@COND_OFFICIAL_BUILD_0@VENDORTAG = _$(VENDOR)
@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 -i $(INC_TIFF) -i $(INC_JPEG) -i $(INC_PNG) -i $(INC_ZLIB) -i $(INC_ODBC) -i $(INC_REGEX) -i $(srcdir) $(__DLLFLAG_p_1) -o minimal$(EXEEXT) $(MACOSX_RESOURCES) mondrian.r
@@ -154,18 +169,18 @@ clean:
install: all
minimal.o: $(srcdir)/minimal.cpp
$(CXXC) -c -o $@ $(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-minimal.o: $(srcdir)/minimal.cpp
$(CXXC) -c -o $@ $(MINIMAL_CXXFLAGS) $<
distclean: clean
rm -f configure config.cache config.log config.status
rm -f bk-deps shared-ld-sh
minimal_rc.o: $(srcdir)/minimal.rc
minimal-minimal_rc.o: $(srcdir)/minimal.rc
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2)
minimal$(EXEEXT): minimal.o $(__minimal___win32rc)
$(CXX) -o $@ minimal.o $(__minimal___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p)
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) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p)
$(__minimal___mac_rezcmd)
$(__minimal___mac_setfilecmd)