aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2012-10-14 19:16:34 +0000
committerAnders Broman <anders.broman@ericsson.com>2012-10-14 19:16:34 +0000
commitf8d36704a85759acf7e3b2412f79e032a7ad9fe0 (patch)
tree955bcf9272af99a7a5e96c59c1eb9ed50b2ec001
parent091559e2abca87425bf2489faca328364c475a9a (diff)
Revert back to GTK2
svn path=/trunk/; revision=45541
-rw-r--r--config.nmake2
-rw-r--r--packaging/nsis/wireshark.nsi2
2 files changed, 2 insertions, 2 deletions
diff --git a/config.nmake b/config.nmake
index e7365a51ef..ee38fe5670 100644
--- a/config.nmake
+++ b/config.nmake
@@ -233,7 +233,7 @@ GLIB_VERSION=2.0
# directory in which the "include" and "lib" directories reside.
#
# Set the name to gtk3 if you want to use gtk3 - Not yet working
-GTK_NAME=gtk3
+GTK_NAME=gtk2
GTK_DIR=$(WIRESHARK_LIB_DIR)\$(GTK_NAME)
# These macros are used by the nsis installer script and by the install target.
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 5869ecf4d4..b5a9073575 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -19,7 +19,7 @@ SetCompressor /SOLID lzma
; ============================================================================
; The file to write
-OutFile "${PROGRAM_NAME}-${WIRESHARK_TARGET_PLATFORM}-gtk3-${VERSION}.exe"
+OutFile "${PROGRAM_NAME}-${WIRESHARK_TARGET_PLATFORM}-${VERSION}.exe"
; Installer icon
Icon "..\..\image\wiresharkinst.ico"