diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-09-16 09:55:44 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-09-16 09:55:44 +0000 |
| commit | 055736b65544aa9a9abb639cac02c5aacbd1d815 (patch) | |
| tree | 8c4c1f69a23de9404fcc88202e2bf6a8ab43355e | |
| parent | 8e10fa73d5ffca0fbc79c63b489f57ec88cc73b4 (diff) | |
| download | wireshark-055736b65544aa9a9abb639cac02c5aacbd1d815.tar.gz wireshark-055736b65544aa9a9abb639cac02c5aacbd1d815.tar.bz2 wireshark-055736b65544aa9a9abb639cac02c5aacbd1d815.zip | |
Compile and install schemas if GTK3 is used, nsis needs update too
svn path=/trunk/; revision=44923
| -rw-r--r-- | Makefile.nmake | 3 | ||||
| -rw-r--r-- | config.nmake | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index d08de675a1..f3a11504ff 100644 --- 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 1410b15b82..0d18e99c14 100644 --- 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 \ |