X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c3255f5fbab93ad229178ec1610a180afa35133a..f20a2e1f4066e4f0235698e6220f1eed91c73326:/samples/render/Makefile.in diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in index d17b7feba4..3d0fa00fe9 100644 --- a/samples/render/Makefile.in +++ b/samples/render/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.3 (http://bakefile.sourceforge.net) +# Bakefile 0.1.4 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -124,7 +124,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ @COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ -@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) @@ -156,7 +156,7 @@ render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc) $(__render___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p render.app/Contents mkdir -p render.app/Contents/MacOS mkdir -p render.app/Contents/Resources @@ -165,7 +165,7 @@ render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/render/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >render.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >render.app/Contents/Info.plist echo -n "APPL????" >render.app/Contents/PkgInfo @@ -175,7 +175,7 @@ render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc render.app/Contents/Resources/render.rsrc - ln -sf $(top_srcdir)/src/mac/wxmac.icns render.app/Contents/Resources/wxmac.icns + ln -sf $(top_srcdir)/src/mac/carbon/wxmac.icns render.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@render_bundle: render.app/Contents/PkgInfo