Rebaked (build/bakefiles/common.bkl 1.95->1.96 change)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2004-10-18 17:02:37 +00:00
parent e0aeebed0a
commit 0e3165d725
136 changed files with 730 additions and 184 deletions

View File

@@ -58,6 +58,11 @@ CUBE_OBJECTS = \
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
@COND_USE_OPENGL_1@__cube___depname = cube$(EXEEXT)
@COND_PLATFORM_MAC_1@__cube___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C cube$(EXEEXT)
@COND_PLATFORM_MAC_1@__cube___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -111,7 +116,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
### Targets: ###
all: cube$(EXEEXT) $(__cube_bundle___depname)
all: $(__cube___depname) $(__cube_bundle___depname)
install: all
@@ -128,14 +133,14 @@ clean:
distclean: clean
rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
cube$(EXEEXT): $(CUBE_OBJECTS) $(__cube___win32rc)
$(CXX) -o $@ $(CUBE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__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)
$(__cube___mac_rezcmd)
$(__cube___mac_setfilecmd)
$(__cube___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
@COND_USE_OPENGL_1@cube$(EXEEXT): $(CUBE_OBJECTS) $(__cube___win32rc)
@COND_USE_OPENGL_1@ $(CXX) -o $@ $(CUBE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__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)
@COND_USE_OPENGL_1@ $(__cube___mac_rezcmd)
@COND_USE_OPENGL_1@ $(__cube___mac_setfilecmd)
@COND_USE_OPENGL_1@ $(__cube___os2_emxbindcmd)
@COND_USE_OPENGL_1@ $(SAMPLES_RPATH_POSTLINK)
cube.app/Contents/PkgInfo: cube$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
cube.app/Contents/PkgInfo: $(__cube___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p cube.app/Contents
mkdir -p cube.app/Contents/MacOS
mkdir -p cube.app/Contents/Resources