From 10cc14fa299dc5257b4ebf5f24bd301fbf07a929 Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Wed, 8 May 2002 18:18:38 +0000 Subject: [PATCH] corrected application bundle building for Mac OS X git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/makeprog.env.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/makeprog.env.in b/src/makeprog.env.in index 1b2d8aebd5..9dc501ed51 100644 --- a/src/makeprog.env.in +++ b/src/makeprog.env.in @@ -30,7 +30,7 @@ include $(top_builddir)/src/make.env all: $(BIN_PROGRAM) @MACOSX_BUNDLE@ install_dirs install_data $(BIN_PROGRAM): $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(RES_PROGRAM_OBJ) @LIBWXMACRES@ - $(CXX) $(LDFLAGS_EXE) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS) $(LIBRARIES) $(RES_PROGRAM_OBJ) + $(CXX) $(LDFLAGS_EXE) -o $@ $(OBJECTS) $(LDLIBS) $(LIBRARIES) $(RES_PROGRAM_OBJ) @LIBWXMACRESCOMP@ install_dirs: @@ -51,9 +51,9 @@ clean: # # Targets to build a Mac OS X application bundle # -bundle: $(BUNDLE)/Info.plist $(BUNDLE)/PkgInfo $(BUNDLE)/MacOS/$(PROGRAM) $(BUNDLE)/Resources/$(PROGRAM).rsrc $(BUNDLE)/Resources/$(PROGRAM).icns +bundle: $(BUNDLE)/MacOS/$(PROGRAM) $(BUNDLE)/Info.plist $(BUNDLE)/PkgInfo $(BUNDLE)/Resources/$(PROGRAM).rsrc $(BUNDLE)/Resources/$(PROGRAM).icns -$(BUNDLE)/Info.plist: $(top_srcdir)/src/$(TOOLKITDIR)/Info.plist.in $(BIN_PROGRAM) +$(BUNDLE)/Info.plist: $(top_srcdir)/src/$(TOOLKITDIR)/Info.plist.in $(BUNDLE)/MacOS/$(PROGRAM) @$(INSTALL) -d `dirname $@` sed -e "s/IDENTIFIER/`echo $(program_dir) | sed 's,/,.,g'`/" \ -e "s/EXECUTABLE/$(PROGRAM)/" \ @@ -63,13 +63,13 @@ $(BUNDLE)/PkgInfo: @$(INSTALL) -d `dirname $@` echo -n "APPL????" > $@ -$(BUNDLE)/MacOS/$(PROGRAM): $(BIN_PROGRAM) +$(BUNDLE)/MacOS/$(PROGRAM): $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ @$(INSTALL) -d `dirname $@` - cp $< $@ + $(CXX) $(LDFLAGS_EXE) -o $@ $(OBJECTS) $(LDLIBS) $(LIBRARIES) -$(BUNDLE)/Resources/$(PROGRAM).rsrc: $(top_builddir)/lib/@WX_RESOURCES_MACOSX@ - @$(INSTALL) -d `dirname $@` - cp $< $@ +$(BUNDLE)/Resources/$(PROGRAM).rsrc: $(top_builddir)/lib/@WX_RESOURCES_MACOSX_DATA@ + @$(INSTALL) -d `dirname $@` + cp $< $@ $(BUNDLE)/Resources/$(PROGRAM).icns: $(top_srcdir)/src/$(TOOLKITDIR)/wxmac.icns @$(INSTALL) -d `dirname $@` -- 2.45.2