install both compiled and ascii resource files for Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
parent
e4a55e2136
commit
e95edd8d51
15
Makefile.in
15
Makefile.in
@ -301,27 +301,27 @@ SONAME_FLAGS_GL = @SONAME_FLAGS_GL@
|
||||
|
||||
all: @WX_ALL@
|
||||
|
||||
$(build_libdir)/@WX_LIBRARY_NAME_STATIC@: $(OBJECTS)
|
||||
$(build_libdir)/@WX_LIBRARY_NAME_STATIC@: $(OBJECTS)
|
||||
@$(INSTALL) -d $(build_libdir)
|
||||
@$(RM) $@
|
||||
$(AR) $(AROPTIONS) $@ $(OBJECTS)
|
||||
$(RANLIB) $@
|
||||
|
||||
$(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@: glcanvas.o
|
||||
$(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@: glcanvas.o
|
||||
@$(INSTALL) -d $(build_libdir)
|
||||
@$(RM) $@
|
||||
$(AR) $(AROPTIONS) $@ glcanvas.o
|
||||
$(RANLIB) $@
|
||||
|
||||
$(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
|
||||
$(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
|
||||
@$(INSTALL) -d $(build_libdir)
|
||||
$(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS)
|
||||
|
||||
$(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
|
||||
$(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
|
||||
@$(INSTALL) -d $(build_libdir)
|
||||
$(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o -L$(build_libdir) @WXCONFIG_LIBS@ $(EXTRALIBS) $(OPENGLLIBS)
|
||||
|
||||
$(build_libdir)/@WX_RESOURCES_MACOSX@: $(MACRESOURCES)
|
||||
$(build_libdir)/@WX_RESOURCES_MACOSX_ASCII@: $(MACRESOURCES)
|
||||
@$(INSTALL) -d $(build_libdir)
|
||||
$(RESCOMP) -d __UNIX__ -useDF $^ -o $@
|
||||
|
||||
@ -442,12 +442,13 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
|
||||
echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \
|
||||
done
|
||||
|
||||
preinstall_res: $(build_libdir)/@WX_RESOURCES_MACOSX_COMPILED@
|
||||
preinstall_res: $(build_libdir)/@WX_RESOURCES_MACOSX_ASCII@ $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@
|
||||
@echo " "
|
||||
@echo " Installing wxWindows Mac resource ..."
|
||||
@echo " "
|
||||
@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
|
||||
$(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_COMPILED@ $(libdir)/@WX_RESOURCES_MACOSX_COMPILED@
|
||||
$(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_ASCII@ $(libdir)/@WX_RESOURCES_MACOSX_ASCII@
|
||||
$(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@ $(libdir)/@WX_RESOURCES_MACOSX_DATA@
|
||||
|
||||
preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@
|
||||
@echo " "
|
||||
|
||||
28
configure.in
28
configure.in
@ -2292,10 +2292,6 @@ WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}"
|
||||
WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}"
|
||||
WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
|
||||
|
||||
dnl the name of the resources file for wxMac
|
||||
WX_RESOURCES_MACOSX="lib${WX_LIBRARY}.rsrc"
|
||||
WX_RESOURCES_MACOSX_COMPILED="lib${WX_LIBRARY}.r"
|
||||
|
||||
case "${host}" in
|
||||
*-*-cygwin* | *-*-mingw32* )
|
||||
|
||||
@ -2314,7 +2310,17 @@ case "${host}" in
|
||||
WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}"
|
||||
WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
|
||||
fi
|
||||
;;
|
||||
|
||||
*-*-darwin* )
|
||||
dnl Under Mac OS X, we should build real frameworks instead of simple
|
||||
dnl dynamic shared libraries (in order to embed the resources)
|
||||
if test "$wxUSE_MAC" = 1; then
|
||||
dnl the name of the resources file for wxMac
|
||||
WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.r"
|
||||
WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.rsrc"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
dnl the name of the static library
|
||||
@ -2429,12 +2435,14 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
*-*-darwin* )
|
||||
dnl For Unix to MacOS X porting instructions, see:
|
||||
dnl http://fink.sourceforge.net/doc/porting/porting.html
|
||||
CFLAGS="$CFLAGS -fno-common -DDYLIB_INIT"
|
||||
CXXFLAGS="$CXXFLAGS -fno-common -DDYLIB_INIT"
|
||||
CFLAGS="$CFLAGS -fno-common -DWXMAKINGDLL"
|
||||
CXXFLAGS="$CXXFLAGS -fno-common -DWXMAKINGDLL"
|
||||
dnl Executables must necessarily fully bind the wxWindows library at
|
||||
dnl program launch otherwise lazy binding breaks RTTI class info
|
||||
LDFLAGS_EXE="$LDFLAGS_EXE -Wl,-bind_at_load"
|
||||
SHARED_LD="$CXX -dynamiclib -init _wxWindowsDylibInit -o"
|
||||
dnl The initialization routine doesn't seem useful with lazy linking solved
|
||||
dnl SHARED_LD="$CXX -dynamiclib -init _wxWindowsDylibInit -o"
|
||||
SHARED_LD="$CXX -dynamiclib -o"
|
||||
PIC_FLAG="-dynamic -fPIC"
|
||||
SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION}"
|
||||
SONAME_FLAGS_GL=${SONAME_FLAGS}
|
||||
@ -2528,7 +2536,7 @@ if test "$wxUSE_MAC" = 1; then
|
||||
MACOSX_BUNDLE="bundle"
|
||||
LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r"
|
||||
LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
|
||||
LIBWXMACRESWXCONFIG="${RESCOMP} Carbon.r -t APPL \${prefix}/lib/${WX_RESOURCES_MACOSX_COMPILED} -o"
|
||||
LIBWXMACRESWXCONFIG="${RESCOMP} Carbon.r -t APPL \${prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
|
||||
else
|
||||
if test "$wxUSE_PM" = 1; then
|
||||
LIBWXMACRESCOMP="emxbind -ep \$(BIN_PROGRAM)"
|
||||
@ -4892,8 +4900,8 @@ dnl additional resurces settings
|
||||
AC_SUBST(RESCOMP)
|
||||
AC_SUBST(RESFLAGS)
|
||||
AC_SUBST(RESPROGRAMOBJ)
|
||||
AC_SUBST(WX_RESOURCES_MACOSX)
|
||||
AC_SUBST(WX_RESOURCES_MACOSX_COMPILED)
|
||||
AC_SUBST(WX_RESOURCES_MACOSX_ASCII)
|
||||
AC_SUBST(WX_RESOURCES_MACOSX_DATA)
|
||||
|
||||
dnl additional for Mac OS X
|
||||
AC_SUBST(DEREZ)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user