diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2018-09-10 09:09:24 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2018-09-10 09:09:24 -0400 |
| commit | 8f1b55bfb7dfe2272d489dc70c745e6125662a0c (patch) | |
| tree | d2cb0575d8069df7d39b7073484e8401eb4eca2e | |
| parent | e1a88e96883e7209f7f0d954cb78ed2f6d63f347 (diff) | |
| download | textadept-8f1b55bfb7dfe2272d489dc70c745e6125662a0c.tar.gz textadept-8f1b55bfb7dfe2272d489dc70c745e6125662a0c.zip | |
Updated to GTK 2.24.32 on Windows.
| -rw-r--r-- | src/Makefile | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/src/Makefile b/src/Makefile index 55b8fb66..ba63966a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -25,7 +25,7 @@ ifeq (win, $(findstring win, $(MAKECMDGOALS))) --cflags gtk+-2.0) GTK_LIBS = $(shell PKG_CONFIG_PATH=`pwd`/win32gtk/lib/pkgconfig \ pkg-config --define-variable=prefix=win32gtk \ - --libs gtk+-2.0) + --libs gtk+-2.0 gmodule-2.0) GLIB_CFLAGS = $(shell PKG_CONFIG_PATH=`pwd`/win32gtk/lib/pkgconfig \ pkg-config --define-variable=prefix=win32gtk \ --cflags glib-2.0) @@ -375,9 +375,7 @@ lspawn_zip = 9a8b4b5e4137.zip gtdialog_zip = 6435a42450c7.zip cdk_tgz = cdk-5.0-20150928.tgz termkey_tgz = libtermkey-0.20.tar.gz -win32gtk_zip = gtk+-bundle_2.24.10-20120208_win32.zip -win32iconv_bin_zip = libiconv-bin-zip.php -win32iconv_lib_zip = libiconv-lib-zip.php +win32gtk_zip = win32gtk-2.24.32.zip win32curses_zip = win32curses.zip pdcurses_zip = pdcurs34.zip gtkosx_tgz = gtkosx-2.24.31.tar.gz @@ -423,18 +421,8 @@ termkey: termkey.patch | $(termkey_tgz) if [ -d $@ ]; then rm -r $@; fi mkdir $@ && tar xzf $| -C $@ && mv $@/*/* $@ && chmod +w $@/termkey.h patch -d $@ -N -p1 < $< -$(win32gtk_zip): - wget http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.24/$@ -$(win32iconv_bin_zip): ; wget http://gnuwin32.sourceforge.net/downlinks/$@ -$(win32iconv_lib_zip): ; wget http://gnuwin32.sourceforge.net/downlinks/$@ -win32gtk: | $(win32gtk_zip) $(win32iconv_bin_zip) $(win32iconv_lib_zip) - mkdir $@ - unzip -d $@ $(win32gtk_zip) - for zip in $(win32iconv_bin_zip) $(win32iconv_lib_zip); do \ - unzip -d $@ $$zip; \ - done - rm -r $@/etc/bash_completion.d $@/lib/gtk-2.0/modules $@/lib/*.def - cd $@/share && rm -r aclocal doc glib-2.0 gtk-2.0 gtk-doc locale man +$(win32gtk_zip): ; wget http://foicica.com/textadept/download/$@ +win32gtk: | $(win32gtk_zip) ; unzip $| $(win32curses_zip): ; wget http://foicica.com/textadept/download/$@ $(pdcurses_zip): ; wget http://prdownloads.sourceforge.net/pdcurses/$@ win32curses: | $(win32curses_zip) $(pdcurses_zip) @@ -453,8 +441,7 @@ $(bombay_zip): ; wget http://foicica.com/hg/bombay/archive/tip.zip -O $@ $(cloc): ; wget http://prdownloads.sourceforge.net/cloc/$@ -O $@ sign-deps: | $(scintilla_tgz) $(lua_tgz) $(lpeg_tgz) $(lfs_zip) $(lspawn_zip) \ $(gtdialog_zip) $(cdk_tgz) $(termkey_tgz) $(win32gtk_zip) \ - $(win32iconv_bin_zip) $(win32iconv_lib_zip) $(win32curses_zip) \ - $(pdcurses_zip) $(gtkosx_tgz) + $(win32curses_zip) $(pdcurses_zip) $(gtkosx_tgz) @for file in $|; do gpg -ab $$file; done verify-deps: | $(wildcard $(basename $(wildcard *.asc))) @for file in $|; do echo "$$file"; gpg --verify $$file.asc || return 1; done |