Compile and install schemas if GTK3 is used, nsis needs update too

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44923 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.nmake b/Makefile.nmake
index d08de675a1aa3052c22d285a1a2e10745068b32a..f3a11504ff7877aa8744135e5895a6714f42f5d4 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1174,6 +1174,9 @@ install-all: install-generated-files
        xcopy $(GTK_DIR)\bin\$(XML_DLL) $(INSTALL_DIR) /d
 !ENDIF
 !IF "$(GTK_INST_VERSION)" == "3.4"
+       if not exist $(INSTALL_DIR)\$(GTK_SCHEMAS_INST_DIR) mkdir $(INSTALL_DIR)\$(GTK_SCHEMAS_INST_DIR)
+       if not exist $(GTK_DIR)\$(GTK_SCHEMAS_INST_DIR)\gschemas.compiled $(GTK_DIR)\bin\glib-compile-schemas $(GTK_DIR)\$(GTK_SCHEMAS_INST_DIR)
+       xcopy $(GTK_DIR)\$(GTK_SCHEMAS_INST_DIR)\gschemas.compiled  $(INSTALL_DIR)\$(GTK_SCHEMAS_INST_DIR) /d
 !ELSE
        if not exist $(INSTALL_DIR)\$(GTK_WIMP_DLLDST_DIR) mkdir $(INSTALL_DIR)\$(GTK_WIMP_DLLDST_DIR)
        xcopy "$(GTK_WIMP_DLLSRC_DIR)\libwimp.dll" $(INSTALL_DIR)\$(GTK_WIMP_DLLDST_DIR) /d

diff --git a/config.nmake b/config.nmake
index 1410b15b82ffe81adc85e53790457359a5c5fc1f..0d18e99c14bc6fd417785745d652b06b7180c969 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -1067,6 +1067,7 @@ GTK_WIMP_RCDST_DIR=etc\gtk-2.0
 # Use of GTK3+ is experimental/not working
 #
 !ELSEIF "$(GTK_INST_VERSION)" == "3.4"
+GTK_SCHEMAS_INST_DIR=\share\glib-2.0\schemas
 
 # GTK+
 GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-3.0 \