added missing include files for compilation with Apple Developer Tools

[wxWidgets.git] / samples / internat / Makefile.in

diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in
index db593794d4c1851d8a05b00c403da2d5681af1fc..17fee84c98504f3778c6560aab7a346683f9f8e9 100644 (file)
--- a/samples/internat/Makefile.in
+++ b/samples/internat/Makefile.in
@@ -35,7 +35,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
 ### Variables: ###
 
 DESTDIR = 

-WX_VERSION = 2.5.1
+WX_VERSION = 2.5.2

 LIBDIRNAME = $(top_builddir)lib
 INTERNAT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 LIBDIRNAME = $(top_builddir)lib
 INTERNAT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)


@@ -70,6 +70,10 @@ COND_PLATFORM_OS2_1___internat___os2_emxbindcmd = $(NM) internat$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__internat_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__internat_bundle___depname = internat_bundle
 @COND_PLATFORM_OS2_1@__internat_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__internat_bundle___depname = internat_bundle

+@COND_TOOLKIT_COCOA@____internat_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   internat.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____internat_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     internat.app/Contents/PkgInfo

 COND_MONOLITHIC_0___WXLIB_CORE_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(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)_core-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)


@@ -99,7 +103,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
        $(srcdir)/../../samples -i $(top_srcdir)/include -o internat$(EXEEXT) \
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
        $(srcdir)/../../samples -i $(top_srcdir)/include -o internat$(EXEEXT) \

-       Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
+       Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###


@@ -128,7 +132,7 @@ internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc)
        $(__internat___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__internat___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns

        mkdir -p internat.app/Contents
        mkdir -p internat.app/Contents/MacOS
        mkdir -p internat.app/Contents/Resources
        mkdir -p internat.app/Contents
        mkdir -p internat.app/Contents/MacOS
        mkdir -p internat.app/Contents/Resources


@@ -146,10 +150,10 @@ internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
        ln -f internat$(EXEEXT) internat.app/Contents/MacOS/internat
        
        
        ln -f internat$(EXEEXT) internat.app/Contents/MacOS/internat
        
        

-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc internat.app/Contents/Resources/internat.rsrc
-       ln -sf $(top_srcdir)/src/mac/carbon/wxmac.icns internat.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc internat.app/Contents/Resources/internat.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns internat.app/Contents/Resources/wxmac.icns

 
 

-@COND_PLATFORM_MACOSX_1@internat_bundle: internat.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@internat_bundle: $(____internat_BUNDLE_TGT_REF_DEP)

 
 bg: 
        @mkdir -p ./bg
 
 bg: 
        @mkdir -p ./bg