Mercurial > pidgin
changeset 15470:015ad1283216
Some more changes to the win32 build to support cross-compiling.
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Wed, 31 Jan 2007 04:31:12 +0000 |
| parents | 2c81b0a81790 |
| children | 8fc14c228ca8 |
| files | Makefile.mingw libpurple/plugins/perl/common/Makefile.mingw libpurple/win32/global.mak pidgin/plugins/perl/common/Makefile.mingw |
| diffstat | 4 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.mingw Tue Jan 30 21:04:04 2007 +0000 +++ b/Makefile.mingw Wed Jan 31 04:31:12 2007 +0000 @@ -72,13 +72,13 @@ rm -rf $(GAIM_INSTALL_DIR).release cp -R $(GAIM_INSTALL_DIR) $(GAIM_INSTALL_DIR).release find $(GAIM_INSTALL_DIR).release \( -name '*.dll' -o -name '*.exe' \) \ - -not \( -false $(NON_GAIM_DLLS_FIND_EXP) \) -exec strip --strip-unneeded {} ';' + -not \( -false $(NON_GAIM_DLLS_FIND_EXP) \) -exec $(STRIP) --strip-unneeded {} ';' installer: create_release_install_dir $(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DWITH_GTK /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi installer_nogtk: create_release_install_dir - $(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi + $(MAKENSIS) -V3 -DGAIM_VERSION="$(GAIM_VERSION)" -DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" -DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" -DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi installer_debug: install $(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR)" /DDEBUG /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi
--- a/libpurple/plugins/perl/common/Makefile.mingw Tue Jan 30 21:04:04 2007 +0000 +++ b/libpurple/plugins/perl/common/Makefile.mingw Wed Jan 31 04:31:12 2007 +0000 @@ -9,7 +9,7 @@ TARGET = Gaim AUTOSPLIT = lib/auto/Gaim/autosplit.ix -EXTUTILS := C:/perl/lib/ExtUtils +EXTUTILS ?= C:/perl/lib/ExtUtils PERL_PLUGIN_TOP := .. CFLAGS += -Wno-comment
--- a/libpurple/win32/global.mak Tue Jan 30 21:04:04 2007 +0000 +++ b/libpurple/win32/global.mak Wed Jan 31 04:31:12 2007 +0000 @@ -85,6 +85,7 @@ MAKENSIS ?= makensis.exe PERL ?= /cygdrive/c/perl/bin/perl WINDRES ?= windres +STRIP ?= strip GAIM_COMMON_RULES := $(GAIM_LIB_TOP)/win32/rules.mak GAIM_COMMON_TARGETS := $(GAIM_LIB_TOP)/win32/targets.mak
--- a/pidgin/plugins/perl/common/Makefile.mingw Tue Jan 30 21:04:04 2007 +0000 +++ b/pidgin/plugins/perl/common/Makefile.mingw Wed Jan 31 04:31:12 2007 +0000 @@ -8,7 +8,7 @@ include $(GAIM_TOP)/libpurple/win32/global.mak TARGET = GtkUI -EXTUTILS := C:/perl/lib/ExtUtils +EXTUTILS ?= C:/perl/lib/ExtUtils CFLAGS += -Wno-comment