callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'msvc-broadway-improvements' into 'gtk-3-24'

Browse Source 
GDK-Broadway build improvements for Visual Studio

See merge request GNOME/gtk!4927
This commit is contained in:
Chun-wei Fan
2022-08-05 10:30:01 +00:00
parent 8954c60e89 a27bacc1fe
commit 7f5ebd2878
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gdk/broadway/Makefile.am
View File

@ -40,10 +40,10 @@ EXTRA_DIST += broadway.js rawinflate.min.js
# built headers that don't get installed
broadway_built_sources = \
${broadway_built_private_headers}
$(broadway_built_private_headers)
libgdk_broadway_la_SOURCES = \
${broadway_built_private_headers}\
$(broadway_built_private_headers)\
$(GDK_BROADWAY_NON_GENERATED_SOURCES)
if OS_UNIX

13
win32/generate-msvc.mak
View File

@ -142,6 +142,19 @@ generate-base-sources: \
@$(PYTHON) $(GLIB_MKENUMS) --template $(@F).template $(gdk_public_h_sources) $(gdk_deprecated_h_sources) > ..\win32\$@
@cd ..\win32
# Generate the private headers needed for broadway-server.c
generate-broadway-items: ..\gdk\broadway\clienthtml.h ..\gdk\broadway\broadwayjs.h
..\gdk\broadway\clienthtml.h: ..\gdk\broadway\client.html
@echo Generating $@...
@$(PERL) ..\gdk\broadway\toarray.pl client_html $**>$@
..\gdk\broadway\broadwayjs.h: \
..\gdk\broadway\broadway.js \
..\gdk\broadway\rawinflate.min.js
@echo Generating $@...
@$(PERL) ..\gdk\broadway\toarray.pl broadway_js $**>$@
.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypebuiltins.h \
.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypebuiltins.c:
@echo Generating $@...