improved Mac resource creation step in order to allow samples to provide

specific Rez options (used in docview sample)
added separate Mac Finder flag modification step (using SetFile)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

configure.in

@@ -3015,6 +3015,10 @@ else
     STATIC_FLAG="no"
 fi
 
+dnl default value is comment for makefile
+MACRESCOMP="#"
+MACSETFILE="#"
+MACRESWXCONFIG="#"
 if test "$wxUSE_MAC" = 1; then
     dnl add the resources target for wxMac
     LIBWXMACRES="\$(top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
@@ -3022,14 +3026,16 @@ if test "$wxUSE_MAC" = 1; then
     WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res"
     AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
     AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez)
+    AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile)
     MACOSX_BUNDLE="bundle"
     dnl resources are bundled both with shared library and applications
     dnl since the carb resource *must* be included in the application
-    LIBWXMACRESCOMP="\$(RESCOMP) -t APPL Carbon.r ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
+    MACRESCOMP="\$(RESCOMP) -d __DARWIN__ -t APPL Carbon.r ${LIBWXMACRES} -o"
-    LIBWXMACRESWXCONFIG="${RESCOMP} -t APPL Carbon.r \${prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
+    MACSETFILE="\$(SETFILE)"
+    MACRESWXCONFIG="${RESCOMP} -d __DARWIN__ -t APPL Carbon.r \$(top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}} -o"
 else
     if test "$wxUSE_PM" = 1; then
-        LIBWXMACRESCOMP="emxbind -ep \$(BIN_PROGRAM)"
+        MACRESCOMP="emxbind -ep"
     fi
 fi
 
@@ -5412,8 +5418,9 @@ dnl additional for Mac OS X
 AC_SUBST(DEREZ)
 AC_SUBST(MACOSX_BUNDLE)
 AC_SUBST(LIBWXMACRES)
-AC_SUBST(LIBWXMACRESCOMP)
+AC_SUBST(MACRESCOMP)
-AC_SUBST(LIBWXMACRESWXCONFIG)
+AC_SUBST(MACSETFILE)
+AC_SUBST(MACRESWXCONFIG)
 
 dnl other tools
 AC_SUBST(GCC)

samples/docview/Makefile.in

@@ -18,6 +18,9 @@ PROGRAM=docview
 OBJECTS =$(PROGRAM).o doc.o view.o
 DEPFILES=$(PROGRAM).d doc.d view.d
 
+RESOPTIONS=-i $(top_srcdir)/$(program_dir) chart.r doc.r docview.r mondrian.r -c WXMA
+SETOPTIONS=-a C
+
 include ../../src/makeprog.env
 
 @IF_GNU_MAKE@-include $(DEPFILES)

samples/minimal/Makefile.in

@@ -18,6 +18,9 @@ PROGRAM=minimal
 OBJECTS =$(PROGRAM).o
 DEPFILES=$(PROGRAM).d
 
+RESOPTIONS=-i $(top_srcdir)/$(program_dir) mondrian.r
+SETOPTIONS=-a C
+
 include ../../src/makeprog.env
 
 @IF_GNU_MAKE@-include $(DEPFILES)

src/make.env.in

@@ -57,6 +57,8 @@ RESCOMP     = @RESCOMP@
 
 DEREZ       = @DEREZ@
 
+SETFILE     = @SETFILE@
+
 DLLTOOL     = @DLLTOOL@
 
 INSTALL         = @INSTALL@

src/makeprog.env.in

@@ -34,7 +34,8 @@ 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 $@ $(OBJECTS) $(LDLIBS) $(LIBRARIES) $(RES_PROGRAM_OBJ)
-	@LIBWXMACRESCOMP@
+	@MACRESCOMP@ $(BIN_PROGRAM) $(RESOPTIONS)
+	@MACSETFILE@ $(SETOPTIONS) $(BIN_PROGRAM)
 
 install_dirs:
 	@list='$(DATADIRS)'; for p in $$list; do \

wx-config.in

@@ -147,7 +147,7 @@ while test $# -gt 0; do
       echo @LDFLAGS_EXE@
       ;;
     --rezflags)
-      echo @LIBWXMACRESWXCONFIG@
+      echo @MACRESWXCONFIG@
       ;;
     --libs)
       if test "@libdir@" != "/usr/lib" \