adding new toolkits for osx

[wxWidgets.git] / samples / mobile / wxedit / Makefile.in

diff --git a/samples/mobile/wxedit/Makefile.in b/samples/mobile/wxedit/Makefile.in
index 9a4993c892cdac9382286fe208bde7ef37565040..c7090a836c50d356610ed577f453ca26de79c77a 100644 (file)
--- a/samples/mobile/wxedit/Makefile.in
+++ b/samples/mobile/wxedit/Makefile.in
@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___wxedit___os2_emxbindcmd = $(NM) wxedit$(EXEEXT) | if grep
 @COND_PLATFORM_MACOSX_1@__wxedit_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = wxedit.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__wxedit_bundle___depname = wxedit_bundle
 @COND_PLATFORM_MACOSX_1@__wxedit_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = wxedit.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__wxedit_bundle___depname = wxedit_bundle

+@COND_TOOLKIT_OSX_CARBON@____wxedit_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__wxedit_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____wxedit_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__wxedit_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____wxedit_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__wxedit_app_Contents_PkgInfo___depname)

 @COND_TOOLKIT_COCOA@____wxedit_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__wxedit_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____wxedit_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__wxedit_app_Contents_PkgInfo___depname)

-@COND_TOOLKIT_MAC@____wxedit_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__wxedit_app_Contents_PkgInfo___depname)

 COND_MONOLITHIC_0___WXLIB_CORE_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)


@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 wxedit$(EXEEXT): $(WXEDIT_OBJECTS) $(__wxedit___win32rc)
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 wxedit$(EXEEXT): $(WXEDIT_OBJECTS) $(__wxedit___win32rc)

-       $(CXX) -o $@ $(WXEDIT_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_CORE_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 $@ $(WXEDIT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_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)

        
        $(__wxedit___mac_setfilecmd)
        $(__wxedit___os2_emxbindcmd)
        
        $(__wxedit___mac_setfilecmd)
        $(__wxedit___os2_emxbindcmd)


@@ -186,6 +190,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
 $(srcdir)/include/wx/stc/stc.h
 
 # Include dependency info, if present:
 $(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 wxedit_bundle
 
 .PHONY: all install uninstall clean distclean wxedit_bundle