regenerated

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-07 13:31:56 +00:00
parent 07613d7c91
commit cee65fd727
6 changed files with 373 additions and 373 deletions
@@ -38,7 +38,6 @@ TREELAY_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../include $(CXXFLAGS)
TREELAY_OBJECTS = \
$(__treelay___win32rc) \
treelay_treelay.o \
$(__treelay___win32rc)
@@ -106,7 +105,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
$(__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) -i $(srcdir)/../../../include -o treelay$(EXEEXT) Carbon.r \
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r samples/sample.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)
@@ -122,7 +121,6 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@COND_PLATFORM_MAC_1@__treelay___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@COND_PLATFORM_MAC_1@__treelay___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C treelay$(EXEEXT)
@COND_PLATFORM_WIN32_1@__treelay___win32rc = treelay_sample_rc.o
@COND_PLATFORM_WIN32_1@__treelay___win32rc = treelay_treelay_rc.o
### Targets: ###
@@ -142,14 +140,11 @@ install: all
install-strip: install
treelay$(EXEEXT): $(TREELAY_OBJECTS) $(__treelay___win32rc) $(__treelay___win32rc)
treelay$(EXEEXT): $(TREELAY_OBJECTS) $(__treelay___win32rc)
$(CXX) -o $@ $(TREELAY_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-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) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
$(__treelay___mac_rezcmd)
$(__treelay___mac_setfilecmd)
treelay_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)
treelay_treelay.o: $(srcdir)/treelay.cpp
$(CXXC) -c -o $@ $(TREELAY_CXXFLAGS) $<
@@ -8,7 +8,7 @@
BCCDIR = $(MAKEDIR)\..
!endif
!include ../../../../build/config.bcc
!include ../../../../build/msw/config.bcc
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
@@ -138,6 +138,8 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
!endif
MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DWXUNIV=$(WXUNIV)
all: $(OBJS)
$(OBJS):
@@ -4,7 +4,7 @@
# Do not modify, all changes will be overwritten!
# =========================================================================
include ../../../../build/config.gcc
include ../../../../build/msw/config.gcc
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
@@ -132,6 +132,8 @@ ifeq ($(WXUNIV),1)
__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
endif
MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
all: $(OBJS)
$(OBJS):
@@ -4,7 +4,7 @@
# Do not modify, all changes will be overwritten!
# =========================================================================
!include <../../../../build/config.vc>
!include <../../../../build/msw/config.vc>
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
@@ -4,7 +4,7 @@
# Do not modify, all changes will be overwritten!
# =========================================================================
!include ../../../../build/config.wat
!include ../../../../build/msw/config.wat
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
@@ -167,6 +167,7 @@ TREELAY_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
TREELAY_OBJECTS = &
$(OBJS)\treelay_treelay.obj
MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
all : $(OBJS)
File diff suppressed because it is too large Load Diff