adding new toolkits for osx

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-09-11 14:14:21 +00:00
parent 5d81550097
commit ffa9db0d2a
14 changed files with 115 additions and 56 deletions

View File

@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___test___os2_emxbindcmd = $(NM) test$(EXEEXT) | if grep -q \
@COND_PLATFORM_MACOSX_1@__test_app_Contents_PkgInfo___depname \
@COND_PLATFORM_MACOSX_1@ = test.app/Contents/PkgInfo
@COND_PLATFORM_MACOSX_1@__test_bundle___depname = test_bundle
@COND_TOOLKIT_OSX_CARBON@____test_BUNDLE_TGT_REF_DEP \
@COND_TOOLKIT_OSX_CARBON@ = $(__test_app_Contents_PkgInfo___depname)
@COND_TOOLKIT_OSX_COCOA@____test_BUNDLE_TGT_REF_DEP \
@COND_TOOLKIT_OSX_COCOA@ = $(__test_app_Contents_PkgInfo___depname)
@COND_TOOLKIT_OSX_IPHONE@____test_BUNDLE_TGT_REF_DEP \
@COND_TOOLKIT_OSX_IPHONE@ = $(__test_app_Contents_PkgInfo___depname)
@COND_TOOLKIT_COCOA@____test_BUNDLE_TGT_REF_DEP = \
@COND_TOOLKIT_COCOA@ $(__test_app_Contents_PkgInfo___depname)
@COND_TOOLKIT_MAC@____test_BUNDLE_TGT_REF_DEP = \
@COND_TOOLKIT_MAC@ $(__test_app_Contents_PkgInfo___depname)
COND_MONOLITHIC_0___WXLIB_HTML_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
@@ -148,7 +152,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
$(CXX) -o $@ $(TEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
$(__test___mac_setfilecmd)
$(__test___os2_emxbindcmd)
@@ -205,6 +209,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
$(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
@IF_GNU_MAKE@-include ./.deps/*.d
@IF_GNU_MAKE@-include .deps/*.d
.PHONY: all install uninstall clean distclean test_bundle data