Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make install should now install *.cur/*.ico/*.bmp files under Win32

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-11-30 21:36:27 +00:00
parent bdac73ce95
commit 934a9da8db
3 changed files with 530 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile.in
View File

@@ -396,6 +396,14 @@ m4datainstall: preinstall
$(INSTALL) -d $(datadir)/aclocal $(INSTALL) -d $(datadir)/aclocal
$(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal $(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal
win32install: preinstall
$(INSTALL) -d $(includedir)/wx/msw
$(INSTALL_DATA) $(top_srcdir)/include/wx/msw/*.cur \
$(top_srcdir)/include/wx/msw/*.ico \
$(top_srcdir)/include/wx/msw/*.bmp \
$(top_srcdir)/include/wx/msw/wx.rc \
$(includedir)/wx/msw
# this is the real install target: copies the library, wx-config and the # this is the real install target: copies the library, wx-config and the
# headers to the installation directory # headers to the installation directory
preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config
@@ -421,7 +429,7 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
$(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \ $(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \
$(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
$(INSTALL) -d $(includedir)/wx (INSTALL) -d $(includedir)/wx
@# FIXME: This will erroneously install a wx/base dir for wxBase.. @# FIXME: This will erroneously install a wx/base dir for wxBase..
@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
@@ -462,7 +470,7 @@ preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@
@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
@INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@ @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall @WIN32INSTALL@
@echo " " @echo " "
@echo " The installation of wxWindows is finished. On certain" @echo " The installation of wxWindows is finished. On certain"
@echo " platforms (e.g. Linux) you'll now have to run ldconfig" @echo " platforms (e.g. Linux) you'll now have to run ldconfig"
@@ -493,7 +501,7 @@ uninstall:
@$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config @$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config
@$(RM) $(datadir)/wx/$(VER_MAJMIN)/afm/* @$(RM) $(datadir)/wx/$(VER_MAJMIN)/afm/*
@$(RM) $(datadir)/wx/$(VER_MAJMIN)/gs_afm/* @$(RM) $(datadir)/wx/$(VER_MAJMIN)/gs_afm/*
# FIXME: wxBase doesnt install these next 3 dirs. # FIXME: wxBase doesnt install these next 3 dirs.
@-rmdir $(datadir)/wx/$(VER_MAJMIN)/gs_afm @-rmdir $(datadir)/wx/$(VER_MAJMIN)/gs_afm
@-rmdir $(datadir)/wx/$(VER_MAJMIN)/afm @-rmdir $(datadir)/wx/$(VER_MAJMIN)/afm
@-rmdir $(datadir)/wx/$(VER_MAJMIN) @-rmdir $(datadir)/wx/$(VER_MAJMIN)
@@ -502,6 +510,7 @@ uninstall:
@list='$(HEADERS)'; for p in $$list; do \ @list='$(HEADERS)'; for p in $$list; do \
$(RM) $(includedir)/wx/$$p; \ $(RM) $(includedir)/wx/$$p; \
done done
# TODO: uninstall the files installed by win32install
@echo " Removing i18n files..." @echo " Removing i18n files..."
@-for p in $(WX_LINGUAS); do \ @-for p in $(WX_LINGUAS); do \
$(RM) $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \ $(RM) $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \

1011
configure vendored
View File

File diff suppressed because it is too large Load Diff

5
configure.in
View File

@@ -1878,6 +1878,7 @@ dnl search for toolkit (widget sets)
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
AFMINSTALL= AFMINSTALL=
WIN32INSTALL=
TOOLKIT= TOOLKIT=
TOOLKIT_INCLUDE= TOOLKIT_INCLUDE=
@@ -1933,6 +1934,9 @@ if test "$USE_WIN32" = 1 ; then
RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__" RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
RESPROGRAMOBJ="\$(PROGRAM)_resources.o" RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
dnl install Win32-specific files in "make install"
WIN32INSTALL=win32install
fi fi
if test "$USE_DARWIN" = 1; then if test "$USE_DARWIN" = 1; then
@@ -5235,6 +5239,7 @@ AC_SUBST(WXDEBUG_DEFINE)
dnl toolkit options dnl toolkit options
AC_SUBST(USE_GUI) AC_SUBST(USE_GUI)
AC_SUBST(AFMINSTALL) AC_SUBST(AFMINSTALL)
AC_SUBST(WIN32INSTALL)
AC_SUBST(TOOLKIT) AC_SUBST(TOOLKIT)
AC_SUBST(TOOLKIT_DIR) AC_SUBST(TOOLKIT_DIR)
AC_SUBST(TOOLKIT_VPATH) AC_SUBST(TOOLKIT_VPATH)