diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-11-29 00:07:54 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-11-29 00:07:54 +0000 |
| commit | c6b0614f22b4db895b64dbe8bcb2ae4701181e12 (patch) | |
| tree | c94e1712033a1400513d2953965c6ac34e66140c | |
| parent | c48fa2353b9a1ff55110ede80f42c7808a41f766 (diff) | |
Allow for, but don't yet use, GTK+ 2.24.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40032 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | config.nmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config.nmake b/config.nmake index fd84500a75..5dad38e7c1 100644 --- a/config.nmake +++ b/config.nmake @@ -1045,7 +1045,7 @@ GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-2.0.lib \ $(GLIB_LIBS) # 2.18 was no good(Theming problem) -!IF "$(GTK_INST_VERSION)" == "2.22" || "$(GTK_INST_VERSION)" == "2.16" || "$(GTK_INST_VERSION)" == "2.14" +!IF "$(GTK_INST_VERSION)" == "2.24" || "$(GTK_INST_VERSION)" == "2.22" || "$(GTK_INST_VERSION)" == "2.16" || "$(GTK_INST_VERSION)" == "2.14" GTK_LIB_DIR=2.10.0 !IFDEF PNG_DLL @@ -1063,8 +1063,8 @@ NEED_FREETYPE_DLL=USE NEED_FONTCONFIG_DLL=USE NEED_EXPAT_DLL=USE -GTK_WIMP_DLLSRC_DIR=$(GTK_DIR)\lib\gtk-2.0\2.10.0\engines -GTK_WIMP_DLLDST_DIR=lib\gtk-2.0\2.10.0\engines +GTK_WIMP_DLLSRC_DIR=$(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\engines +GTK_WIMP_DLLDST_DIR=lib\gtk-2.0\$(GTK_LIB_DIR)\engines GTK_WIMP_RCSRC_DIR=$(GTK_DIR)\share\themes\MS-Windows\gtk-2.0 GTK_WIMP_RCDST_DIR=etc\gtk-2.0 !ELSE |