Add support for GLib/GTK+ 2.8. Point to the latest tag.
svn path=/trunk/; revision=16802
This commit is contained in:
Gerald Combs
parent
2c7bbf1fb1
commit
253b96e81f
|
|
@ -447,7 +447,12 @@ verify_tools:
|
|||
# Download and install all the required libraries into ETHEREAL_LIBS.
|
||||
# If you used this setup target before, consider doing a clean_setup.
|
||||
setup: verify_tools
|
||||
!IF "$(GTK2_INST_VERSION)" == "2.6"
|
||||
!IF "$(GTK2_INST_VERSION)" == "2.8"
|
||||
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
|
||||
glib gtk2.8/glib-2.8.4-20051212.zip
|
||||
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
|
||||
glib gtk2.8/glib-dev-2.8.4-20051212.zip
|
||||
!ELSEIF "$(GTK2_INST_VERSION)" == "2.6"
|
||||
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
|
||||
glib gtk2.6/glib-2.6.6.zip
|
||||
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
|
||||
|
|
@ -483,20 +488,35 @@ setup: verify_tools
|
|||
!ENDIF
|
||||
!IFDEF ADNS_DIR
|
||||
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
|
||||
. adns-1.0-win32-04.zip
|
||||
. adns-1.0-win32-05.zip
|
||||
!ENDIF
|
||||
!IFDEF PCRE_DIR
|
||||
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
|
||||
pcre-6.3 pcre-6.3-bin.zip
|
||||
pcre-6.4 pcre-6.4-bin.zip
|
||||
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
|
||||
pcre-6.3 pcre-6.3-lib.zip
|
||||
pcre-6.4 pcre-6.4-lib.zip
|
||||
!ENDIF
|
||||
!IFDEF ZLIB_DIR
|
||||
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
|
||||
zlib123-dll zlib123-dll.zip
|
||||
!ENDIF
|
||||
!IFDEF GTK2_DIR
|
||||
!IF "$(GTK2_INST_VERSION)" == "2.6"
|
||||
!IF "$(GTK2_INST_VERSION)" == "2.8"
|
||||
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
|
||||
gtk2 gtk2.8/gtk+-2.8.9.zip
|
||||
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
|
||||
gtk2 gtk2.8/gtk+-dev-2.8.9.zip
|
||||
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
|
||||
gtk2 gtk2.8/cairo-1.0.2.zip
|
||||
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
|
||||
gtk2 gtk2.8/cairo-dev-1.0.2.zip
|
||||
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
|
||||
gtk2 gtk2.8/atk-1.10.3.zip
|
||||
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
|
||||
gtk2 gtk2.8/atk-dev-1.10.3.zip
|
||||
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
|
||||
gtk2 gtk2.8/libpng-1.2.8-bin.zip
|
||||
!ELSEIF "$(GTK2_INST_VERSION)" == "2.6"
|
||||
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
|
||||
gtk2 gtk2.6/gtk+-2.6.9.zip
|
||||
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
|
||||
|
|
@ -524,7 +544,12 @@ setup: verify_tools
|
|||
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
|
||||
gtk2 gtk2/atk-dev-1.4.0.zip
|
||||
!ENDIF
|
||||
!IF "$(PANGO_INST_VERSION)" == "1.8"
|
||||
!IF "$(PANGO_INST_VERSION)" == "1.10"
|
||||
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
|
||||
gtk2 gtk2.8/pango-1.10.1.zip
|
||||
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
|
||||
gtk2 gtk2.8/pango-dev-1.10.1.zip
|
||||
!ELSEIF "$(PANGO_INST_VERSION)" == "1.8"
|
||||
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
|
||||
gtk2 gtk2.6/pango-1.8.2.zip
|
||||
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
|
||||
|
|
@ -597,6 +622,9 @@ install-gtk2-deps: install-required-deps
|
|||
xcopy $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders\libpixbufloader-*.dll lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders /d
|
||||
xcopy $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\im-*.dll lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules /d
|
||||
xcopy $(GTK2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules\pango-*.dll lib\pango\$(PANGO_LIB_DIR)\modules /d
|
||||
!IFDEF NEED_LIBPNG_DLL
|
||||
xcopy $(GTK2_DIR)\bin\libpng13.dll . /d
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
|
||||
install-gtk1-deps: install-required-deps
|
||||
|
|
|
|||
22
config.nmake
22
config.nmake
|
|
@ -79,11 +79,13 @@ GTK2_DIR=$(ETHEREAL_LIBS)\gtk2
|
|||
#
|
||||
#GTK2_INST_VERSION=2.2
|
||||
#PANGO_INST_VERSION=1.2
|
||||
GTK2_INST_VERSION=2.4
|
||||
PANGO_INST_VERSION=1.4
|
||||
# Support of GTK 2.6 is currently very experimental ...
|
||||
#GTK2_INST_VERSION=2.4
|
||||
#PANGO_INST_VERSION=1.4
|
||||
# Support for GTK 2.6 and 2.8 is currently very experimental ...
|
||||
#GTK2_INST_VERSION=2.6
|
||||
#PANGO_INST_VERSION=1.8
|
||||
GTK2_INST_VERSION=2.8
|
||||
PANGO_INST_VERSION=1.10
|
||||
|
||||
#
|
||||
# If you have GTK-Wimp, set this to the pathname of the directory in
|
||||
|
|
@ -122,7 +124,7 @@ NET_SNMP_DIR=$(ETHEREAL_LIBS)\net-snmp-5.2.1.2
|
|||
# If you don't have GNU ADNS, comment this line out, so that ADNS_DIR
|
||||
# isn't defined.
|
||||
#
|
||||
ADNS_DIR=$(ETHEREAL_LIBS)\adns-1.0-win32-04
|
||||
ADNS_DIR=$(ETHEREAL_LIBS)\adns-1.0-win32-05
|
||||
|
||||
#
|
||||
# If you have the PCRE (Perl Compatible Regular Expressions) library,
|
||||
|
|
@ -132,7 +134,7 @@ ADNS_DIR=$(ETHEREAL_LIBS)\adns-1.0-win32-04
|
|||
# If you don't have PCRE, comment this line out, so that PCRE_DIR
|
||||
# isn't defined.
|
||||
#
|
||||
PCRE_DIR=$(ETHEREAL_LIBS)\pcre-6.3
|
||||
PCRE_DIR=$(ETHEREAL_LIBS)\pcre-6.4
|
||||
|
||||
#
|
||||
# If you have the Nettle encryption library, set this to the pathname
|
||||
|
|
@ -285,6 +287,7 @@ GTK1_LIBS=$(GTK1_DIR)\lib\gtk.lib \
|
|||
GTK2_CFLAGS=$(GLIB_CFLAGS) /I$(GTK2_DIR)\include\gtk-2.0 \
|
||||
/I$(GTK2_DIR)\lib\gtk-2.0\include \
|
||||
/I$(GTK2_DIR)\include\atk-1.0 \
|
||||
/I$(GTK2_DIR)\include\cairo \
|
||||
/I$(GTK2_DIR)\include\pango-1.0
|
||||
GTK2_LIBS=$(GTK2_DIR)\lib\gtk-win32-2.0.lib \
|
||||
$(GTK2_DIR)\lib\gdk-win32-2.0.lib \
|
||||
|
|
@ -293,7 +296,10 @@ GTK2_LIBS=$(GTK2_DIR)\lib\gtk-win32-2.0.lib \
|
|||
$(GLIB_LIBS)
|
||||
|
||||
# the lib dir of GTK2.6 didn't changed since 2.4.0
|
||||
!IF "$(GTK2_INST_VERSION)" == "2.6"
|
||||
!IF "$(GTK2_INST_VERSION)" == "2.8"
|
||||
GTK2_LIB_DIR=2.4.0
|
||||
NEED_LIBPNG_DLL=USE
|
||||
!ELSEIF "$(GTK2_INST_VERSION)" == "2.6"
|
||||
GTK2_LIB_DIR=2.4.0
|
||||
!ELSEIF "$(GTK2_INST_VERSION)" == "2.4"
|
||||
GTK2_LIB_DIR=2.4.0
|
||||
|
|
@ -302,7 +308,9 @@ GTK2_LIB_DIR=2.2.0
|
|||
!ENDIF
|
||||
|
||||
# the lib dir of PANGO1.8 didn't changed since 1.4.0
|
||||
!IF "$(PANGO_INST_VERSION)" == "1.8"
|
||||
!IF "$(PANGO_INST_VERSION)" == "1.10"
|
||||
PANGO_LIB_DIR=1.4.0
|
||||
!ELSEIF "$(PANGO_INST_VERSION)" == "1.8"
|
||||
PANGO_LIB_DIR=1.4.0
|
||||
!ELSEIF "$(PANGO_INST_VERSION)" == "1.4"
|
||||
PANGO_LIB_DIR=1.4.0
|
||||
|
|
|
|||
|
|
@ -116,8 +116,8 @@ $(DEST)-setup-$(VERSION).exe : $(NSI) $(DELIVERABLES) Makefile.nmake
|
|||
!ENDIF
|
||||
!IFDEF GTK2_DIR
|
||||
/DGTK2_DIR=$(GTK2_DIR) \
|
||||
/DGTK2_INST_VERSION=$(GTK2_INST_VERSION) \
|
||||
/DPANGO_INST_VERSION=$(PANGO_INST_VERSION) \
|
||||
/DGTK2_LIB_DIR=$(GTK2_LIB_DIR) \
|
||||
/DPANGO_LIB_DIR=$(PANGO_LIB_DIR) \
|
||||
!ENDIF
|
||||
!IFDEF GTK_WIMP_DIR
|
||||
/DGTK_WIMP_DIR=$(GTK_WIMP_DIR) \
|
||||
|
|
|
|||
|
|
@ -619,23 +619,26 @@ File "${GTK2_DIR}\bin\libgtk-win32-2.0-0.dll"
|
|||
File "${GTK2_DIR}\bin\libatk-1.0-0.dll"
|
||||
File "${GTK2_DIR}\bin\libpango-1.0-0.dll"
|
||||
File "${GTK2_DIR}\bin\libpangowin32-1.0-0.dll"
|
||||
!ifdef NEED_LIBPNG_DLL
|
||||
File "${GTK2_DIR}\bin\libpng13.dll"
|
||||
!endif
|
||||
SetOutPath $INSTDIR\etc\gtk-2.0
|
||||
File "${GTK2_DIR}\etc\gtk-2.0\*.*"
|
||||
SetOutPath $INSTDIR\etc\pango
|
||||
File "${GTK2_DIR}\etc\pango\pango.*"
|
||||
SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_INST_VERSION}.0\loaders
|
||||
File "${GTK2_DIR}\lib\gtk-2.0\${GTK2_INST_VERSION}.0\loaders\libpixbufloader-*.dll"
|
||||
SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_INST_VERSION}.0\immodules
|
||||
File "${GTK2_DIR}\lib\gtk-2.0\${GTK2_INST_VERSION}.0\immodules\im-*.dll"
|
||||
SetOutPath $INSTDIR\lib\pango\${PANGO_INST_VERSION}.0\modules
|
||||
File "${GTK2_DIR}\lib\pango\${PANGO_INST_VERSION}.0\modules\pango-*.dll"
|
||||
SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_LIB_DIR}\loaders
|
||||
File "${GTK2_DIR}\lib\gtk-2.0\${GTK2_LIB_DIR}\loaders\libpixbufloader-*.dll"
|
||||
SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_LIB_DIR}\immodules
|
||||
File "${GTK2_DIR}\lib\gtk-2.0\${GTK2_LIB_DIR}\immodules\im-*.dll"
|
||||
SetOutPath $INSTDIR\lib\pango\${PANGO_LIB_DIR}\modules
|
||||
File "${GTK2_DIR}\lib\pango\${PANGO_LIB_DIR}\modules\pango-*.dll"
|
||||
SectionEnd
|
||||
|
||||
!ifdef GTK_WIMP_DIR
|
||||
Section "GTK-Wimp" SecGTKWimp
|
||||
;-------------------------------------------
|
||||
SectionIn 1
|
||||
SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_INST_VERSION}.0\engines
|
||||
SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_LIB_DIR}\engines
|
||||
File "${GTK_WIMP_DIR}\libwimp.dll"
|
||||
SetOutPath $INSTDIR\share\themes\Default\gtk-2.0
|
||||
File "${GTK_WIMP_DIR}\Theme\gtk-2.0\gtkrc"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/sh
|
||||
|
||||
# DOWNLOAD_PREFIX="http://www.ethereal.com/distribution/win32/development"
|
||||
DOWNLOAD_PREFIX="http://anonsvn.ethereal.com/ethereal-win32-libs/tags/2005-09-23/packages"
|
||||
DOWNLOAD_PREFIX="http://anonsvn.ethereal.com/ethereal-win32-libs/tags/2005-12-14/packages"
|
||||
|
||||
err_exit () {
|
||||
echo ""
|
||||
|
|
|
|||
Loading…
Reference in New Issue