osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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

svn path=/trunk/; revision=44923
This commit is contained in:
Anders Broman 2012-09-16 09:55:44 +00:00
parent 8e10fa73d5
commit 055736b655
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.nmake
View File

@ -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

1
config.nmake
View File

@ -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 \