X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c3255f5fbab93ad229178ec1610a180afa35133a..fe947a6116844e23acf8458512f452904a4f08f9:/contrib/samples/ogl/ogledit/Makefile.in diff --git a/contrib/samples/ogl/ogledit/Makefile.in b/contrib/samples/ogl/ogledit/Makefile.in index ef1c6b4138..1a8f414008 100644 --- a/contrib/samples/ogl/ogledit/Makefile.in +++ b/contrib/samples/ogl/ogledit/Makefile.in @@ -97,7 +97,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) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ @@ -133,7 +133,7 @@ ogledit$(EXEEXT): $(OGLEDIT_OBJECTS) $(__ogledit___win32rc) $(__ogledit___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -ogledit.app/Contents/PkgInfo: ogledit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +ogledit.app/Contents/PkgInfo: ogledit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p ogledit.app/Contents mkdir -p ogledit.app/Contents/MacOS mkdir -p ogledit.app/Contents/Resources @@ -142,7 +142,7 @@ ogledit.app/Contents/PkgInfo: ogledit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/ogledit/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >ogledit.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >ogledit.app/Contents/Info.plist echo -n "APPL????" >ogledit.app/Contents/PkgInfo