From 3292e9d67bd0f85f31a49e34eda1242845a7474f Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Thu, 26 May 2022 16:53:34 +0800 Subject: [PATCH 1/7] MSVC Projects: Rename Makefile variable Use VS1X instead of VS10 in the variable names in the NMake Makefiles, since the VS2010 MSBuild Visual Studio project files really apply to all Visual Studio versions at or after VS2010. Also use variable substitution here to ease future maintenance. --- win32/config-msvc.mak.in | 4 ++-- win32/generate-msvc.mak | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/win32/config-msvc.mak.in b/win32/config-msvc.mak.in index c39d7170b0..26ab2186ba 100644 --- a/win32/config-msvc.mak.in +++ b/win32/config-msvc.mak.in @@ -120,8 +120,8 @@ GTK_PREPROCESSOR_FLAGS = \ /DISOLATION_AWARE_ENABLED DEMO_VS9_PROJ = gtk3-demo.vcproj -DEMO_VS10_PROJ = gtk3-demo.vcxproj -DEMO_VS10_PROJ_FILTERS = gtk3-demo.vcxproj.filters +DEMO_VS1X_PROJ = $(DEMO_VS9_PROJ:.vcproj=.vcxproj) +DEMO_VS1X_PROJ_FILTERS = $(DEMO_VS9_PROJ:.vcproj=.vcxproj.filters) DEMO_DEP_LIBS_NEW_PANGO=harfbuzz.lib DEMO_DEP_LIBS_PANGOFT2_VS1X=pangoft2-1.0.lib;harfbuzz.lib;freetype.lib DEMO_DEP_LIBS_PANGOFT2_VS9=$(DEMO_DEP_LIBS_PANGOFT2_VS1X:;= ) diff --git a/win32/generate-msvc.mak b/win32/generate-msvc.mak index b4f5a69f93..4c6eb8d217 100644 --- a/win32/generate-msvc.mak +++ b/win32/generate-msvc.mak @@ -271,34 +271,34 @@ regenerate-demos-h-win32: ..\demos\gtk-demo\geninclude.py $(demo_actual_sources) @$(PYTHON) geninclude.py demos.h.win32 $(demo_sources) @cd ..\..\win32 @echo Regenerating gtk3-demo VS project files... - @-del vs9\$(DEMO_VS9_PROJ) vs10\$(DEMO_VS10_PROJ) vs10\$(DEMO_VS10_PROJ_FILTERS) + @-del vs9\$(DEMO_VS9_PROJ) vs10\$(DEMO_VS1X_PROJ) vs10\$(DEMO_VS1X_PROJ_FILTERS) @for %%s in ($(demo_sources) gtkfishbowl.c main.c) do \ @echo. ^>>gtk3-demo.sourcefiles & \ @echo. ^>>gtk3-demo.vs10.sourcefiles & \ @echo. ^^Source Files^^>>gtk3-demo.vs10.sourcefiles.filters @$(CPP) /nologo /EP /I. vs9\$(DEMO_VS9_PROJ)in>$(DEMO_VS9_PROJ).tmp @for /f "usebackq tokens=* delims=" %%l in ($(DEMO_VS9_PROJ).tmp) do @echo %%l>>$(DEMO_VS9_PROJ).tmp1 - @$(CPP) /nologo /EP /I. vs10\$(DEMO_VS10_PROJ)in>$(DEMO_VS10_PROJ).tmp - @for /f "usebackq tokens=* delims=" %%l in ($(DEMO_VS10_PROJ).tmp) do @echo %%l>>$(DEMO_VS10_PROJ).tmp1 - @$(CPP) /nologo /EP /I. vs10\$(DEMO_VS10_PROJ_FILTERS)in> $(DEMO_VS10_PROJ_FILTERS).tmp - @for /f "usebackq tokens=* delims=" %%l in ($(DEMO_VS10_PROJ_FILTERS).tmp) do @ echo %%l>>vs10\$(DEMO_VS10_PROJ_FILTERS) + @$(CPP) /nologo /EP /I. vs10\$(DEMO_VS1X_PROJ)in>$(DEMO_VS1X_PROJ).tmp + @for /f "usebackq tokens=* delims=" %%l in ($(DEMO_VS1X_PROJ).tmp) do @echo %%l>>$(DEMO_VS1X_PROJ).tmp1 + @$(CPP) /nologo /EP /I. vs10\$(DEMO_VS1X_PROJ_FILTERS)in> $(DEMO_VS1X_PROJ_FILTERS).tmp + @for /f "usebackq tokens=* delims=" %%l in ($(DEMO_VS1X_PROJ_FILTERS).tmp) do @ echo %%l>>vs10\$(DEMO_VS1X_PROJ_FILTERS) @if not "$(FONT_FEATURES_DEMO)" == "" \ if not "$(FONT_FEATURES_USE_PANGOFT2)" == "" \ ($(PYTHON) replace.py -a=replace-str -i=$(DEMO_VS9_PROJ).tmp1 -o=vs9\$(DEMO_VS9_PROJ) --instring="AdditionalDependencies=\"\"" --outstring="AdditionalDependencies=\"$(DEMO_DEP_LIBS_PANGOFT2_VS9)\"") & \ - ($(PYTHON) replace.py -a=replace-str -i=$(DEMO_VS10_PROJ).tmp1 -o=vs10\$(DEMO_VS10_PROJ) --instring=">%(AdditionalDependencies)<" --outstring=">$(DEMO_DEP_LIBS_PANGOFT2_VS1X);%(AdditionalDependencies)<") + ($(PYTHON) replace.py -a=replace-str -i=$(DEMO_VS1X_PROJ).tmp1 -o=vs10\$(DEMO_VS1X_PROJ) --instring=">%(AdditionalDependencies)<" --outstring=">$(DEMO_DEP_LIBS_PANGOFT2_VS1X);%(AdditionalDependencies)<") @if not "$(FONT_FEATURES_DEMO)" == "" \ if "$(FONT_FEATURES_USE_PANGOFT2)" == "" \ ($(PYTHON) replace.py -a=replace-str -i=$(DEMO_VS9_PROJ).tmp1 -o=vs9\$(DEMO_VS9_PROJ) --instring="AdditionalDependencies=\"\"" --outstring="AdditionalDependencies=\"$(DEMO_DEP_LIBS_NEW_PANGO)\"") & \ - ($(PYTHON) replace.py -a=replace-str -i=$(DEMO_VS10_PROJ).tmp1 -o=vs10\$(DEMO_VS10_PROJ) --instring=">%(AdditionalDependencies)<" --outstring=">$(DEMO_DEP_LIBS_NEW_PANGO);%(AdditionalDependencies)<") - @if "$(FONT_FEATURES_DEMO)" == "" copy $(DEMO_VS9_PROJ).tmp1 vs9\$(DEMO_VS9_PROJ) & copy $(DEMO_VS10_PROJ).tmp1 vs10\$(DEMO_VS10_PROJ) + ($(PYTHON) replace.py -a=replace-str -i=$(DEMO_VS1X_PROJ).tmp1 -o=vs10\$(DEMO_VS1X_PROJ) --instring=">%(AdditionalDependencies)<" --outstring=">$(DEMO_DEP_LIBS_NEW_PANGO);%(AdditionalDependencies)<") + @if "$(FONT_FEATURES_DEMO)" == "" copy $(DEMO_VS9_PROJ).tmp1 vs9\$(DEMO_VS9_PROJ) & copy $(DEMO_VS1X_PROJ).tmp1 vs10\$(DEMO_VS1X_PROJ) @del *vc*proj*.tmp* gtk3-demo.*sourcefiles* - @for %%v in (11 12 14 15 16 17) do @(copy /y vs10\$(DEMO_VS10_PROJ_FILTERS) vs%v\ & del vs%v\gtk3-demo.vcxproj) - @$(PYTHON) replace.py -a=replace-str -i=vs10\$(DEMO_VS10_PROJ) -o=vs11\$(DEMO_VS10_PROJ) --instring=">v100<" --outstring=">v110<" - @$(PYTHON) replace.py -a=replace-str -i=vs10\$(DEMO_VS10_PROJ) -o=vs12\$(DEMO_VS10_PROJ) --instring=">v100<" --outstring=">v120<" - @$(PYTHON) replace.py -a=replace-str -i=vs10\$(DEMO_VS10_PROJ) -o=vs14\$(DEMO_VS10_PROJ) --instring=">v100<" --outstring=">v140<" - @$(PYTHON) replace.py -a=replace-str -i=vs10\$(DEMO_VS10_PROJ) -o=vs15\$(DEMO_VS10_PROJ) --instring=">v100<" --outstring=">v141<" - @$(PYTHON) replace.py -a=replace-str -i=vs10\$(DEMO_VS10_PROJ) -o=vs16\$(DEMO_VS10_PROJ) --instring=">v100<" --outstring=">v142<" - @$(PYTHON) replace.py -a=replace-str -i=vs10\$(DEMO_VS10_PROJ) -o=vs17\$(DEMO_VS10_PROJ) --instring=">v100<" --outstring=">v143<" + @for %%v in (11 12 14 15 16 17) do @(copy /y vs10\$(DEMO_VS1X_PROJ_FILTERS) vs%v\ & del vs%v\gtk3-demo.vcxproj) + @$(PYTHON) replace.py -a=replace-str -i=vs10\$(DEMO_VS1X_PROJ) -o=vs11\$(DEMO_VS1X_PROJ) --instring=">v100<" --outstring=">v110<" + @$(PYTHON) replace.py -a=replace-str -i=vs10\$(DEMO_VS1X_PROJ) -o=vs12\$(DEMO_VS1X_PROJ) --instring=">v100<" --outstring=">v120<" + @$(PYTHON) replace.py -a=replace-str -i=vs10\$(DEMO_VS1X_PROJ) -o=vs14\$(DEMO_VS1X_PROJ) --instring=">v100<" --outstring=">v140<" + @$(PYTHON) replace.py -a=replace-str -i=vs10\$(DEMO_VS1X_PROJ) -o=vs15\$(DEMO_VS1X_PROJ) --instring=">v100<" --outstring=">v141<" + @$(PYTHON) replace.py -a=replace-str -i=vs10\$(DEMO_VS1X_PROJ) -o=vs16\$(DEMO_VS1X_PROJ) --instring=">v100<" --outstring=">v142<" + @$(PYTHON) replace.py -a=replace-str -i=vs10\$(DEMO_VS1X_PROJ) -o=vs17\$(DEMO_VS1X_PROJ) --instring=">v100<" --outstring=">v143<" # Remove the generated files clean: From b58ba13a9e4c3572bbe46f2480108312f43e215b Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Thu, 26 May 2022 17:45:15 +0800 Subject: [PATCH 2/7] win32/generate-msvc.mak: Split up rule to regenerate demos.h.win32 This way, we can re-use items when we want to support generating project files from the templates, such as building with project files directly from a GIT checkout, or when we add sources and want to quickly add them into the project files. --- win32/generate-msvc.mak | 169 ++++++++++++++++++++++++++++++++-------- 1 file changed, 138 insertions(+), 31 deletions(-) diff --git a/win32/generate-msvc.mak b/win32/generate-msvc.mak index 4c6eb8d217..3212227db5 100644 --- a/win32/generate-msvc.mak +++ b/win32/generate-msvc.mak @@ -58,6 +58,28 @@ GTK_GENERATED_SOURCES = \ .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkresources.c \ $(GTK_VERSION_H) +GTK3_DEMO_VC1X_PROJS = \ + vs10\$(DEMO_VS1X_PROJ) \ + vs11\$(DEMO_VS1X_PROJ) \ + vs12\$(DEMO_VS1X_PROJ) \ + vs14\$(DEMO_VS1X_PROJ) \ + vs15\$(DEMO_VS1X_PROJ) \ + vs16\$(DEMO_VS1X_PROJ) \ + vs17\$(DEMO_VS1X_PROJ) + +GTK3_DEMO_VC1X_PROJ_FILTERS = \ + vs11\$(DEMO_VS1X_PROJ_FILTERS) \ + vs12\$(DEMO_VS1X_PROJ_FILTERS) \ + vs14\$(DEMO_VS1X_PROJ_FILTERS) \ + vs15\$(DEMO_VS1X_PROJ_FILTERS) \ + vs16\$(DEMO_VS1X_PROJ_FILTERS) \ + vs17\$(DEMO_VS1X_PROJ_FILTERS) + +GTK3_DEMO_VCPROJS = \ + vs9\$(DEMO_VS9_PROJ) \ + $(GTK3_DEMO_VC1X_PROJS) \ + $(GTK3_DEMO_VC1X_PROJ_FILTERS) + generate-base-sources: \ .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\config.h \ $(GDK_GENERATED_SOURCES) \ @@ -264,41 +286,126 @@ generate-base-sources: \ @echo Generating $@... @$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(@D) --generate-source $(@D)\iconbrowser.gresource.xml -regenerate-demos-h-win32: ..\demos\gtk-demo\geninclude.py $(demo_actual_sources) - @echo Regenerating demos.h.win32... +gtk3-demo.sourcefiles: $(demo_actual_sources) + @-del vs9\$(DEMO_VS9_PROJ) + @for %%s in ($**) do @echo. ^>>$@ + @for %%s in (gtkfishbowl.c main.c) do @echo. ^>>$@ + +gtk3-demo.vs10.sourcefiles: $(demo_actual_sources) + @-del vs10\$(DEMO_VS1X_PROJ) + @for %%s in ($**) do @echo. ^>>$@ + @for %%s in (gtkfishbowl.c main.c) do @echo. ^>>$@ + +gtk3-demo.vs10.sourcefiles.filters: $(demo_actual_sources) + @-del vs10\$(DEMO_VS1X_PROJ_FILTERS) + @for %%s in ($**) do @echo. ^^Source Files^^>>$@ + @for %%s in (gtkfishbowl.c main.c) do @echo. ^^Source Files^^>>$@ + +vs9\$(DEMO_VS9_PROJ).pre: gtk3-demo.sourcefiles vs9\$(DEMO_VS9_PROJ)in +vs10\$(DEMO_VS1X_PROJ).pre: gtk3-demo.vs10.sourcefiles vs10\$(DEMO_VS1X_PROJ)in +vs10\$(DEMO_VS1X_PROJ_FILTERS): gtk3-demo.vs10.sourcefiles.filters vs10\$(DEMO_VS1X_PROJ_FILTERS)in + +vs9\$(DEMO_VS9_PROJ).pre vs10\$(DEMO_VS1X_PROJ).pre vs10\$(DEMO_VS1X_PROJ_FILTERS): + @$(CPP) /nologo /EP /I. $(@:.pre=)in>$(@F:.pre=).tmp + @for /f "usebackq tokens=* delims=" %%l in ($(@F:.pre=).tmp) do @echo %%l>>$@ + @-del $(@F:.pre=).tmp + @-if "$@" == "vs9\$(DEMO_VS9_PROJ).pre" del gtk3-demo.sourcefiles + @-if "$@" == "vs10\$(DEMO_VS1X_PROJ).pre" del gtk3-demo.vs10.sourcefiles + @-if "$@" == "vs10\$(DEMO_VS1X_PROJ_FILTERS)" del gtk3-demo.vs10.sourcefiles.filters + +!ifdef FONT_FEATURES_DEMO +!ifdef FONT_FEATURES_USE_PANGOFT2 +vs9\$(DEMO_VS9_PROJ): vs9\$(DEMO_VS9_PROJ).pre + @echo Generating $@... + @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@ \ + --instring="AdditionalDependencies=\"\"" \ + --outstring="AdditionalDependencies=\"$(DEMO_DEP_LIBS_PANGOFT2_VS9)\"" + @-del $** + +vs10\$(DEMO_VS1X_PROJ): vs10\$(DEMO_VS1X_PROJ).pre + @echo Generating $@... + @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@ \ + --instring=">%(AdditionalDependencies)<" \ + --outstring=">$(DEMO_DEP_LIBS_PANGOFT2_VS1X);%(AdditionalDependencies)<" + @-del $** +!else +vs9\$(DEMO_VS9_PROJ): vs9\$(DEMO_VS9_PROJ).pre + @echo Generating $@... + @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@ \ + --instring="AdditionalDependencies=\"\"" \ + --outstring="AdditionalDependencies=\"$(DEMO_DEP_LIBS_NEW_PANGO)\"" + @-del $** + +vs10\$(DEMO_VS1X_PROJ): vs10\$(DEMO_VS1X_PROJ).pre + @echo Generating $@... + @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@ \ + --instring=">%(AdditionalDependencies)<" \ + --outstring=">$(DEMO_DEP_LIBS_NEW_PANGO);%(AdditionalDependencies)<" + @-del $** +!endif +!else +vs9\$(DEMO_VS9_PROJ): vs9\$(DEMO_VS9_PROJ).pre +vs10\$(DEMO_VS1X_PROJ): vs10\$(DEMO_VS1X_PROJ).pre + +vs9\$(DEMO_VS9_PROJ) vs10\$(DEMO_VS1X_PROJ): + @echo Renaming $** to $@... + @move $** $@ +!endif + +vs11\$(DEMO_VS1X_PROJ): vs10\$(DEMO_VS1X_PROJ) +vs12\$(DEMO_VS1X_PROJ): vs10\$(DEMO_VS1X_PROJ) +vs14\$(DEMO_VS1X_PROJ): vs10\$(DEMO_VS1X_PROJ) +vs15\$(DEMO_VS1X_PROJ): vs10\$(DEMO_VS1X_PROJ) +vs16\$(DEMO_VS1X_PROJ): vs10\$(DEMO_VS1X_PROJ) +vs17\$(DEMO_VS1X_PROJ): vs10\$(DEMO_VS1X_PROJ) + +vs11\$(DEMO_VS1X_PROJ_FILTERS): vs10\$(DEMO_VS1X_PROJ_FILTERS) +vs12\$(DEMO_VS1X_PROJ_FILTERS): vs10\$(DEMO_VS1X_PROJ_FILTERS) +vs14\$(DEMO_VS1X_PROJ_FILTERS): vs10\$(DEMO_VS1X_PROJ_FILTERS) +vs15\$(DEMO_VS1X_PROJ_FILTERS): vs10\$(DEMO_VS1X_PROJ_FILTERS) +vs16\$(DEMO_VS1X_PROJ_FILTERS): vs10\$(DEMO_VS1X_PROJ_FILTERS) +vs17\$(DEMO_VS1X_PROJ_FILTERS): vs10\$(DEMO_VS1X_PROJ_FILTERS) + +vs11\$(DEMO_VS1X_PROJ): + @echo Copying and updating $** for VS2012 + @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@ --instring=">v100<" --outstring=">v110<" + +vs12\$(DEMO_VS1X_PROJ): + @echo Copying and updating $** for VS2013 + @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@ --instring=">v100<" --outstring=">v120<" + +vs14\$(DEMO_VS1X_PROJ): + @echo Copying and updating $** for VS2015 + @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@ --instring=">v100<" --outstring=">v140<" + +vs15\$(DEMO_VS1X_PROJ): + @echo Copying and updating $** for VS2017 + @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@ --instring=">v100<" --outstring=">v141<" + +vs16\$(DEMO_VS1X_PROJ): + @echo Copying and updating $** for VS2019 + @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@ --instring=">v100<" --outstring=">v142<" + +vs17\$(DEMO_VS1X_PROJ): + @echo Copying and updating $** for VS2022 + @$(PYTHON) replace.py -a=replace-str -i=$** -o=$@ --instring=">v100<" --outstring=">v143<" + +# VS2012+ .vcxproj.filters: We simply copy the VS2010 ones +vs11\$(DEMO_VS1X_PROJ_FILTERS) \ +vs12\$(DEMO_VS1X_PROJ_FILTERS) \ +vs14\$(DEMO_VS1X_PROJ_FILTERS) \ +vs15\$(DEMO_VS1X_PROJ_FILTERS) \ +vs16\$(DEMO_VS1X_PROJ_FILTERS) \ +vs17\$(DEMO_VS1X_PROJ_FILTERS): + @echo Copying $** to $@... + @copy $** $@ + +regenerate-demos-h-win32: ..\demos\gtk-demo\geninclude.py $(demo_actual_sources) $(GTK3_DEMO_VCPROJS) + @echo Regenerating demos.h.win32 and gtk3-demo VS project files... @-del ..\demos\gtk-demo\demos.h.win32 @cd ..\demos\gtk-demo @$(PYTHON) geninclude.py demos.h.win32 $(demo_sources) @cd ..\..\win32 - @echo Regenerating gtk3-demo VS project files... - @-del vs9\$(DEMO_VS9_PROJ) vs10\$(DEMO_VS1X_PROJ) vs10\$(DEMO_VS1X_PROJ_FILTERS) - @for %%s in ($(demo_sources) gtkfishbowl.c main.c) do \ - @echo. ^>>gtk3-demo.sourcefiles & \ - @echo. ^>>gtk3-demo.vs10.sourcefiles & \ - @echo. ^^Source Files^^>>gtk3-demo.vs10.sourcefiles.filters - @$(CPP) /nologo /EP /I. vs9\$(DEMO_VS9_PROJ)in>$(DEMO_VS9_PROJ).tmp - @for /f "usebackq tokens=* delims=" %%l in ($(DEMO_VS9_PROJ).tmp) do @echo %%l>>$(DEMO_VS9_PROJ).tmp1 - @$(CPP) /nologo /EP /I. vs10\$(DEMO_VS1X_PROJ)in>$(DEMO_VS1X_PROJ).tmp - @for /f "usebackq tokens=* delims=" %%l in ($(DEMO_VS1X_PROJ).tmp) do @echo %%l>>$(DEMO_VS1X_PROJ).tmp1 - @$(CPP) /nologo /EP /I. vs10\$(DEMO_VS1X_PROJ_FILTERS)in> $(DEMO_VS1X_PROJ_FILTERS).tmp - @for /f "usebackq tokens=* delims=" %%l in ($(DEMO_VS1X_PROJ_FILTERS).tmp) do @ echo %%l>>vs10\$(DEMO_VS1X_PROJ_FILTERS) - @if not "$(FONT_FEATURES_DEMO)" == "" \ - if not "$(FONT_FEATURES_USE_PANGOFT2)" == "" \ - ($(PYTHON) replace.py -a=replace-str -i=$(DEMO_VS9_PROJ).tmp1 -o=vs9\$(DEMO_VS9_PROJ) --instring="AdditionalDependencies=\"\"" --outstring="AdditionalDependencies=\"$(DEMO_DEP_LIBS_PANGOFT2_VS9)\"") & \ - ($(PYTHON) replace.py -a=replace-str -i=$(DEMO_VS1X_PROJ).tmp1 -o=vs10\$(DEMO_VS1X_PROJ) --instring=">%(AdditionalDependencies)<" --outstring=">$(DEMO_DEP_LIBS_PANGOFT2_VS1X);%(AdditionalDependencies)<") - @if not "$(FONT_FEATURES_DEMO)" == "" \ - if "$(FONT_FEATURES_USE_PANGOFT2)" == "" \ - ($(PYTHON) replace.py -a=replace-str -i=$(DEMO_VS9_PROJ).tmp1 -o=vs9\$(DEMO_VS9_PROJ) --instring="AdditionalDependencies=\"\"" --outstring="AdditionalDependencies=\"$(DEMO_DEP_LIBS_NEW_PANGO)\"") & \ - ($(PYTHON) replace.py -a=replace-str -i=$(DEMO_VS1X_PROJ).tmp1 -o=vs10\$(DEMO_VS1X_PROJ) --instring=">%(AdditionalDependencies)<" --outstring=">$(DEMO_DEP_LIBS_NEW_PANGO);%(AdditionalDependencies)<") - @if "$(FONT_FEATURES_DEMO)" == "" copy $(DEMO_VS9_PROJ).tmp1 vs9\$(DEMO_VS9_PROJ) & copy $(DEMO_VS1X_PROJ).tmp1 vs10\$(DEMO_VS1X_PROJ) - @del *vc*proj*.tmp* gtk3-demo.*sourcefiles* - @for %%v in (11 12 14 15 16 17) do @(copy /y vs10\$(DEMO_VS1X_PROJ_FILTERS) vs%v\ & del vs%v\gtk3-demo.vcxproj) - @$(PYTHON) replace.py -a=replace-str -i=vs10\$(DEMO_VS1X_PROJ) -o=vs11\$(DEMO_VS1X_PROJ) --instring=">v100<" --outstring=">v110<" - @$(PYTHON) replace.py -a=replace-str -i=vs10\$(DEMO_VS1X_PROJ) -o=vs12\$(DEMO_VS1X_PROJ) --instring=">v100<" --outstring=">v120<" - @$(PYTHON) replace.py -a=replace-str -i=vs10\$(DEMO_VS1X_PROJ) -o=vs14\$(DEMO_VS1X_PROJ) --instring=">v100<" --outstring=">v140<" - @$(PYTHON) replace.py -a=replace-str -i=vs10\$(DEMO_VS1X_PROJ) -o=vs15\$(DEMO_VS1X_PROJ) --instring=">v100<" --outstring=">v141<" - @$(PYTHON) replace.py -a=replace-str -i=vs10\$(DEMO_VS1X_PROJ) -o=vs16\$(DEMO_VS1X_PROJ) --instring=">v100<" --outstring=">v142<" - @$(PYTHON) replace.py -a=replace-str -i=vs10\$(DEMO_VS1X_PROJ) -o=vs17\$(DEMO_VS1X_PROJ) --instring=">v100<" --outstring=">v143<" # Remove the generated files clean: From 6f7e3cb3f67aaa1f9d71b291228ae1e2e170dc06 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Thu, 26 May 2022 19:45:47 +0800 Subject: [PATCH 3/7] MSVC projects: Generate demo sources in IntDir This is to reduce the pollution in the souce directories. Update the include paths accordingly. --- win32/generate-msvc.mak | 28 +++++++++++-------- .../gtk3-demo-application.vcxproj.filtersin | 1 - win32/vs10/gtk3-demo-application.vcxprojin | 2 +- win32/vs10/gtk3-demo.vcxproj.filtersin | 1 - win32/vs10/gtk3-demo.vcxprojin | 4 +-- .../vs10/gtk3-icon-browser.vcxproj.filtersin | 1 - win32/vs10/gtk3-icon-browser.vcxprojin | 2 +- win32/vs1x-props/gtk3-build-defines.props | 4 +++ win32/vs9/gtk3-build-defines.vsprops | 8 ++++++ win32/vs9/gtk3-demo-application.vcprojin | 9 +++++- win32/vs9/gtk3-demo.vcprojin | 17 +++++++---- win32/vs9/gtk3-icon-browser.vcprojin | 9 +++++- 12 files changed, 60 insertions(+), 26 deletions(-) diff --git a/win32/generate-msvc.mak b/win32/generate-msvc.mak index 3212227db5..7a485cf509 100644 --- a/win32/generate-msvc.mak +++ b/win32/generate-msvc.mak @@ -88,13 +88,13 @@ generate-base-sources: \ .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtk-win32.rc \ .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\libgtk3.manifest \ .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtk.gresource.xml \ - ..\demos\gtk-demo\demos.h \ - ..\demos\gtk-demo\demo_resources.c \ - ..\demos\icon-browser\resources.c + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-demo\demos.h \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-demo\demo_resources.c \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-icon-browser\resources.c # Copy the pre-defined config.h.win32 and demos.h.win32 .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\config.h: ..\config.h.win32 -..\demos\gtk-demo\demos.h: ..\demos\gtk-demo\demos.h.win32 +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-demo\demos.h: ..\demos\gtk-demo\demos.h.win32 # Generate the versioned headers and resource scripts (*.rc) .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkversionmacros.h: ..\gdk\gdkversionmacros.h.in @@ -112,7 +112,7 @@ generate-base-sources: \ .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\config.h \ .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\gdk\gdkconfig.h \ -..\demos\gtk-demo\demos.h: +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-demo\demos.h: @echo Copying $@... @if not exist $(@D)\ md $(@D) @copy $** $@ @@ -278,13 +278,17 @@ generate-base-sources: \ @$(PYTHON) $(GLIB_GENMARSHAL) $(GTK_MARSHALERS_FLAGS) --body $** >> $@.tmp @move $@.tmp $@ -..\demos\gtk-demo\demo_resources.c: ..\demos\gtk-demo\demo.gresource.xml $(GTK_DEMO_RESOURCES) +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-demo\demo_resources.c: ..\demos\gtk-demo\demo.gresource.xml $(GTK_DEMO_RESOURCES) @echo Generating $@... - @$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(@D) --generate-source $(@D)\demo.gresource.xml + @if not exist $(@D)\ md $(@D) + @$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=..\demos\gtk-demo \ + --generate-source ..\demos\gtk-demo\demo.gresource.xml -..\demos\icon-browser\resources.c: ..\demos\icon-browser\iconbrowser.gresource.xml $(ICON_BROWSER_RESOURCES) +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-icon-browser\resources.c: ..\demos\icon-browser\iconbrowser.gresource.xml $(ICON_BROWSER_RESOURCES) @echo Generating $@... - @$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(@D) --generate-source $(@D)\iconbrowser.gresource.xml + @if not exist $(@D)\ md $(@D) + @$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=..\demos\icon-browser \ + --generate-source ..\demos\icon-browser\iconbrowser.gresource.xml gtk3-demo.sourcefiles: $(demo_actual_sources) @-del vs9\$(DEMO_VS9_PROJ) @@ -409,9 +413,9 @@ regenerate-demos-h-win32: ..\demos\gtk-demo\geninclude.py $(demo_actual_sources) # Remove the generated files clean: - @-del /f /q ..\demos\icon-browser\resources.c - @-del /f /q ..\demos\gtk-demo\demo_resources.c - @-del /f /q ..\demos\gtk-demo\demos.h + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-icon-browser\resources.c + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-demo\demo_resources.c + @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-demo\demos.h @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypebuiltins.c @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtktypebuiltins.h @-del /f /q .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtkprivatetypebuiltins.c diff --git a/win32/vs10/gtk3-demo-application.vcxproj.filtersin b/win32/vs10/gtk3-demo-application.vcxproj.filtersin index b6dc6bdd9d..5b356ef76b 100644 --- a/win32/vs10/gtk3-demo-application.vcxproj.filtersin +++ b/win32/vs10/gtk3-demo-application.vcxproj.filtersin @@ -16,6 +16,5 @@ #include "gtk3-demo-application.vs10.sourcefiles.filters" - Source Files diff --git a/win32/vs10/gtk3-demo-application.vcxprojin b/win32/vs10/gtk3-demo-application.vcxprojin index d4dae5b14b..d269c9f5d5 100644 --- a/win32/vs10/gtk3-demo-application.vcxprojin +++ b/win32/vs10/gtk3-demo-application.vcxprojin @@ -79,7 +79,7 @@ #include "gtk3-demo-application.vs10.sourcefiles" - + diff --git a/win32/vs10/gtk3-demo.vcxproj.filtersin b/win32/vs10/gtk3-demo.vcxproj.filtersin index b67f402acb..a8fa97ddc6 100644 --- a/win32/vs10/gtk3-demo.vcxproj.filtersin +++ b/win32/vs10/gtk3-demo.vcxproj.filtersin @@ -12,6 +12,5 @@ #include "gtk3-demo.vs10.sourcefiles.filters" - Source Files diff --git a/win32/vs10/gtk3-demo.vcxprojin b/win32/vs10/gtk3-demo.vcxprojin index 4d00d11f2d..72abf9bb6c 100644 --- a/win32/vs10/gtk3-demo.vcxprojin +++ b/win32/vs10/gtk3-demo.vcxprojin @@ -44,7 +44,7 @@ - $(GtkBaseIncludes);%(AdditionalIncludeDirectories) + $(Gtk3DemoIncludes);%(AdditionalIncludeDirectories) Level3 CompileAsC @@ -80,7 +80,7 @@ #include "gtk3-demo.vs10.sourcefiles" - + diff --git a/win32/vs10/gtk3-icon-browser.vcxproj.filtersin b/win32/vs10/gtk3-icon-browser.vcxproj.filtersin index 1822eb1e0a..2063a07e95 100644 --- a/win32/vs10/gtk3-icon-browser.vcxproj.filtersin +++ b/win32/vs10/gtk3-icon-browser.vcxproj.filtersin @@ -16,6 +16,5 @@ #include "gtk3-icon-browser.vs10.sourcefiles.filters" - Source Files diff --git a/win32/vs10/gtk3-icon-browser.vcxprojin b/win32/vs10/gtk3-icon-browser.vcxprojin index 098d566e4a..6a0646426b 100644 --- a/win32/vs10/gtk3-icon-browser.vcxprojin +++ b/win32/vs10/gtk3-icon-browser.vcxprojin @@ -82,7 +82,7 @@ #include "gtk3-icon-browser.vs10.sourcefiles" - + diff --git a/win32/vs1x-props/gtk3-build-defines.props b/win32/vs1x-props/gtk3-build-defines.props index 0198734e79..2304a7e736 100644 --- a/win32/vs1x-props/gtk3-build-defines.props +++ b/win32/vs1x-props/gtk3-build-defines.props @@ -15,6 +15,7 @@ $(GtkGenSrcDir);$(GdkGenSrcDir);..\.. $(GdkGenSrcDir)\gdk;..\..\gdk;$(BaseConfigIncludes) $(GtkGenSrcDir)\gtk;..\..\gtk;$(GdkBaseIncludes) + .\$(Configuration)\$(Platform)\obj\gtk3-demo;..\..\gtk;$(GtkBaseIncludes) INCLUDE_IM_am_et;INCLUDE_IM_cedilla;INCLUDE_IM_cyrillic_translit;INCLUDE_IM_ime;INCLUDE_IM_inuktitut;INCLUDE_IM_ipa;INCLUDE_IM_multipress;INCLUDE_IM_thai;INCLUDE_IM_ti_er;INCLUDE_IM_ti_et;INCLUDE_IM_viqr i686 x86_64 @@ -90,6 +91,9 @@ nmake -f install-msvc.mak PREFIX=$(GlibEtcInstallRoot) $(GtkBaseIncludes) + + $(Gtk3DemoIncludes) + $(GtkIncludedImmodulesDefines) diff --git a/win32/vs9/gtk3-build-defines.vsprops b/win32/vs9/gtk3-build-defines.vsprops index 561a5952b1..fec060411d 100644 --- a/win32/vs9/gtk3-build-defines.vsprops +++ b/win32/vs9/gtk3-build-defines.vsprops @@ -55,6 +55,14 @@ Name="GtkBaseIncludesRelease" Value=".\Release\$(PlatformName)\obj\gtk-3\gtk;..\..\gtk;$(GdkBaseIncludesRelease)" /> + + #include "gtk3-demo-application.sourcefiles" - + + + + + + + + #include "gtk3-demo.sourcefiles" - + + + + + + + + #include "gtk3-icon-browser.sourcefiles" - + + + + + + + + Date: Fri, 27 May 2022 18:18:56 +0800 Subject: [PATCH 4/7] build: Do not generate gtk3-demo-application MSVC project Clean up build files a bit, as there is not much point using a 'dist-hook' to generate the Visual Studio project file for this program. --- demos/gtk-demo/Makefile.am | 8 ++------ win32/vs10/Makefile.am | 6 ++---- ...pplication.vcxprojin => gtk3-demo-application.vcxproj} | 2 +- ...oj.filtersin => gtk3-demo-application.vcxproj.filters} | 2 +- win32/vs9/Makefile.am | 3 +-- ...-application.vcprojin => gtk3-demo-application.vcproj} | 2 +- 6 files changed, 8 insertions(+), 15 deletions(-) rename win32/vs10/{gtk3-demo-application.vcxprojin => gtk3-demo-application.vcxproj} (98%) rename win32/vs10/{gtk3-demo-application.vcxproj.filtersin => gtk3-demo-application.vcxproj.filters} (88%) rename win32/vs9/{gtk3-demo-application.vcprojin => gtk3-demo-application.vcproj} (98%) diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am index 06167986ef..6862a4bf88 100644 --- a/demos/gtk-demo/Makefile.am +++ b/demos/gtk-demo/Makefile.am @@ -115,19 +115,15 @@ uninstall-update-icon-cache: test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)" # ------------------- MSVC Build Items ---------------- -MSVCPROJS = gtk3-demo gtk3-demo-application +MSVCPROJS = gtk3-demo gtk3_demo_FILES = $(gtk3_demo_SOURCES) gtk3_demo_EXCLUDES = font_features.c|pagesetup.c -gtk3_demo_application_FILES = $(gtk3_demo_application_SOURCES) -gtk3_demo_application_EXCLUDES = dummy - include $(top_srcdir)/win32/Makefile.msvcproj dist-hook: \ - $(top_builddir)/win32/vs9/gtk3-demo.vcproj \ - $(top_builddir)/win32/vs9/gtk3-demo-application.vcproj + $(top_builddir)/win32/vs9/gtk3-demo.vcproj DISTCLEANFILES = demos.h demos.h.win32 demo_resources.c diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am index b49bb752fe..ad9bede6ab 100644 --- a/win32/vs10/Makefile.am +++ b/win32/vs10/Makefile.am @@ -13,8 +13,6 @@ GENERATED_ITEMS = \ gtk-3.vcxproj.filters \ gtk3-demo.vcxproj \ gtk3-demo.vcxproj.filters \ - gtk3-demo-application.vcxproj \ - gtk3-demo-application.vcxproj.filters \ gtk3-icon-browser.vcxproj \ gtk3-icon-browser.vcxproj.filters \ gailutil-3.vcxproj \ @@ -44,8 +42,8 @@ EXTRA_DIST += \ gtk-update-icon-cache.vcxproj.filters \ gtk3-demo.vcxprojin \ gtk3-demo.vcxproj.filtersin \ - gtk3-demo-application.vcxprojin \ - gtk3-demo-application.vcxproj.filtersin \ + gtk3-demo-application.vcxproj \ + gtk3-demo-application.vcxproj.filters \ gtk3-icon-browser.vcxprojin \ gtk3-icon-browser.vcxproj.filtersin \ gailutil-3.vcxprojin \ diff --git a/win32/vs10/gtk3-demo-application.vcxprojin b/win32/vs10/gtk3-demo-application.vcxproj similarity index 98% rename from win32/vs10/gtk3-demo-application.vcxprojin rename to win32/vs10/gtk3-demo-application.vcxproj index d269c9f5d5..4e7a81e778 100644 --- a/win32/vs10/gtk3-demo-application.vcxprojin +++ b/win32/vs10/gtk3-demo-application.vcxproj @@ -78,7 +78,7 @@ -#include "gtk3-demo-application.vs10.sourcefiles" + diff --git a/win32/vs10/gtk3-demo-application.vcxproj.filtersin b/win32/vs10/gtk3-demo-application.vcxproj.filters similarity index 88% rename from win32/vs10/gtk3-demo-application.vcxproj.filtersin rename to win32/vs10/gtk3-demo-application.vcxproj.filters index 5b356ef76b..86f3c356c3 100644 --- a/win32/vs10/gtk3-demo-application.vcxproj.filtersin +++ b/win32/vs10/gtk3-demo-application.vcxproj.filters @@ -15,6 +15,6 @@ -#include "gtk3-demo-application.vs10.sourcefiles.filters" + Source Files diff --git a/win32/vs9/Makefile.am b/win32/vs9/Makefile.am index f19e52c9f2..fd2332427c 100644 --- a/win32/vs9/Makefile.am +++ b/win32/vs9/Makefile.am @@ -7,7 +7,6 @@ GENERATED_ITEMS = \ gdk-3.vcproj \ gtk-3.vcproj \ gtk3-demo.vcproj \ - gtk3-demo-application.vcproj \ gtk3-icon-browser.vcproj \ gailutil-3.vcproj \ gtk3-version-paths.vsprops @@ -24,7 +23,7 @@ EXTRA_DIST += \ gtk-query-settings.vcproj \ gtk-update-icon-cache.vcproj \ gtk3-demo.vcprojin \ - gtk3-demo-application.vcprojin \ + gtk3-demo-application.vcproj \ gtk3-icon-browser.vcprojin \ gailutil-3.vcprojin \ gtk3-install.vcproj \ diff --git a/win32/vs9/gtk3-demo-application.vcprojin b/win32/vs9/gtk3-demo-application.vcproj similarity index 98% rename from win32/vs9/gtk3-demo-application.vcprojin rename to win32/vs9/gtk3-demo-application.vcproj index 1866e967fe..6661fbc354 100644 --- a/win32/vs9/gtk3-demo-application.vcprojin +++ b/win32/vs9/gtk3-demo-application.vcproj @@ -152,7 +152,7 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > -#include "gtk3-demo-application.sourcefiles" + From 3c3b7e183aec1645959082875122d20f15dee8b2 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 27 May 2022 18:28:19 +0800 Subject: [PATCH 5/7] build: Don't generate icon browser MSVC project The source listing is not likely to change for this one, so clean up the build files a bit, and make the gtk3-icon-browser MSVC project a complete one instead of a template. --- demos/icon-browser/Makefile.am | 10 ---------- win32/vs10/Makefile.am | 6 ++---- ...con-browser.vcxprojin => gtk3-icon-browser.vcxproj} | 5 ++++- ...roj.filtersin => gtk3-icon-browser.vcxproj.filters} | 5 ++++- win32/vs9/Makefile.am | 3 +-- ...-icon-browser.vcprojin => gtk3-icon-browser.vcproj} | 5 ++++- 6 files changed, 15 insertions(+), 19 deletions(-) rename win32/vs10/{gtk3-icon-browser.vcxprojin => gtk3-icon-browser.vcxproj} (95%) rename win32/vs10/{gtk3-icon-browser.vcxproj.filtersin => gtk3-icon-browser.vcxproj.filters} (66%) rename win32/vs9/{gtk3-icon-browser.vcprojin => gtk3-icon-browser.vcproj} (94%) diff --git a/demos/icon-browser/Makefile.am b/demos/icon-browser/Makefile.am index 9183b0170c..a969d72954 100644 --- a/demos/icon-browser/Makefile.am +++ b/demos/icon-browser/Makefile.am @@ -40,14 +40,4 @@ EXTRA_DIST = \ icon.list \ meson.build -# ------------------- MSVC Build Items ---------------- -MSVCPROJS = gtk3-icon-browser - -gtk3_icon_browser_FILES = $(gtk3_icon_browser_SOURCES) -gtk3_icon_browser_EXCLUDES = dummy - -include $(top_srcdir)/win32/Makefile.msvcproj - -dist-hook: $(top_builddir)/win32/vs9/gtk3-icon-browser.vcproj - -include $(top_srcdir)/git.mk diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am index ad9bede6ab..e0967aa30a 100644 --- a/win32/vs10/Makefile.am +++ b/win32/vs10/Makefile.am @@ -13,8 +13,6 @@ GENERATED_ITEMS = \ gtk-3.vcxproj.filters \ gtk3-demo.vcxproj \ gtk3-demo.vcxproj.filters \ - gtk3-icon-browser.vcxproj \ - gtk3-icon-browser.vcxproj.filters \ gailutil-3.vcxproj \ gailutil-3.vcxproj.filters @@ -44,8 +42,8 @@ EXTRA_DIST += \ gtk3-demo.vcxproj.filtersin \ gtk3-demo-application.vcxproj \ gtk3-demo-application.vcxproj.filters \ - gtk3-icon-browser.vcxprojin \ - gtk3-icon-browser.vcxproj.filtersin \ + gtk3-icon-browser.vcxproj \ + gtk3-icon-browser.vcxproj.filters \ gailutil-3.vcxprojin \ gailutil-3.vcxproj.filtersin \ gtk3-install.vcxproj \ diff --git a/win32/vs10/gtk3-icon-browser.vcxprojin b/win32/vs10/gtk3-icon-browser.vcxproj similarity index 95% rename from win32/vs10/gtk3-icon-browser.vcxprojin rename to win32/vs10/gtk3-icon-browser.vcxproj index 6a0646426b..69eba5d6c7 100644 --- a/win32/vs10/gtk3-icon-browser.vcxprojin +++ b/win32/vs10/gtk3-icon-browser.vcxproj @@ -81,7 +81,10 @@ -#include "gtk3-icon-browser.vs10.sourcefiles" + + + + diff --git a/win32/vs10/gtk3-icon-browser.vcxproj.filtersin b/win32/vs10/gtk3-icon-browser.vcxproj.filters similarity index 66% rename from win32/vs10/gtk3-icon-browser.vcxproj.filtersin rename to win32/vs10/gtk3-icon-browser.vcxproj.filters index 2063a07e95..a883ba47b2 100644 --- a/win32/vs10/gtk3-icon-browser.vcxproj.filtersin +++ b/win32/vs10/gtk3-icon-browser.vcxproj.filters @@ -15,6 +15,9 @@ -#include "gtk3-icon-browser.vs10.sourcefiles.filters" + Source Files + Source Files + Source Files + Source Files diff --git a/win32/vs9/Makefile.am b/win32/vs9/Makefile.am index fd2332427c..063c579f89 100644 --- a/win32/vs9/Makefile.am +++ b/win32/vs9/Makefile.am @@ -7,7 +7,6 @@ GENERATED_ITEMS = \ gdk-3.vcproj \ gtk-3.vcproj \ gtk3-demo.vcproj \ - gtk3-icon-browser.vcproj \ gailutil-3.vcproj \ gtk3-version-paths.vsprops @@ -24,7 +23,7 @@ EXTRA_DIST += \ gtk-update-icon-cache.vcproj \ gtk3-demo.vcprojin \ gtk3-demo-application.vcproj \ - gtk3-icon-browser.vcprojin \ + gtk3-icon-browser.vcproj \ gailutil-3.vcprojin \ gtk3-install.vcproj \ gtk3-introspect.vcproj \ diff --git a/win32/vs9/gtk3-icon-browser.vcprojin b/win32/vs9/gtk3-icon-browser.vcproj similarity index 94% rename from win32/vs9/gtk3-icon-browser.vcprojin rename to win32/vs9/gtk3-icon-browser.vcproj index 28c24358d6..f134b05071 100644 --- a/win32/vs9/gtk3-icon-browser.vcprojin +++ b/win32/vs9/gtk3-icon-browser.vcproj @@ -156,7 +156,10 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > -#include "gtk3-icon-browser.sourcefiles" + + + + From e7efafcae717a5692f498127740bf2fb2aea1aa9 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 27 May 2022 18:47:35 +0800 Subject: [PATCH 6/7] MSVC Projects: Generate widget factory GResource sources Add rules in the helper NMake Makefiles to generate the GResource sources for gtk3-widget-factory. This prepares for us to add project files to build that demo program. --- win32/create-lists-msvc.mak | 9 +++++++++ win32/generate-msvc.mak | 10 +++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/win32/create-lists-msvc.mak b/win32/create-lists-msvc.mak index bc2705eab4..a4ba131660 100644 --- a/win32/create-lists-msvc.mak +++ b/win32/create-lists-msvc.mak @@ -211,6 +211,15 @@ NULL= !if [call create-lists.bat footer resource_sources_msvc$(VSVER)_$(PLAT).mak] !endif +!if [call create-lists.bat header resource_sources_msvc$(VSVER)_$(PLAT).mak WIDGET_FACTORY_RESOURCES] +!endif + +!if [for /f %f in ('$(GLIB_COMPILE_RESOURCES) --sourcedir=..\demos\widget-factory --generate-dependencies ..\demos\widget-factory\widget-factory.gresource.xml') do @call create-lists.bat file resource_sources_msvc$(VSVER)_$(PLAT).mak %f] +!endif + +!if [call create-lists.bat footer resource_sources_msvc$(VSVER)_$(PLAT).mak] +!endif + !include resource_sources_msvc$(VSVER)_$(PLAT).mak !if [del /f /q resource_sources_msvc$(VSVER)_$(PLAT).mak] diff --git a/win32/generate-msvc.mak b/win32/generate-msvc.mak index 7a485cf509..1a9cce5d3f 100644 --- a/win32/generate-msvc.mak +++ b/win32/generate-msvc.mak @@ -90,7 +90,8 @@ generate-base-sources: \ .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk-3\gtk\gtk.gresource.xml \ .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-demo\demos.h \ .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-demo\demo_resources.c \ - .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-icon-browser\resources.c + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-icon-browser\resources.c \ + .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-widget-factory\widget_factory_resources.c # Copy the pre-defined config.h.win32 and demos.h.win32 .\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gdk-3\config.h: ..\config.h.win32 @@ -290,6 +291,13 @@ generate-base-sources: \ @$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=..\demos\icon-browser \ --generate-source ..\demos\icon-browser\iconbrowser.gresource.xml +.\vs$(VSVER)\$(CFG)\$(PLAT)\obj\gtk3-widget-factory\widget_factory_resources.c: \ +..\demos\icon-browser\iconbrowser.gresource.xml $(WIDGET_FACTORY_RESOURCES) + @echo Generating $@... + @if not exist $(@D)\ md $(@D) + @$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=..\demos\widget-factory \ + --generate-source ..\demos\widget-factory\widget-factory.gresource.xml + gtk3-demo.sourcefiles: $(demo_actual_sources) @-del vs9\$(DEMO_VS9_PROJ) @for %%s in ($**) do @echo. ^>>$@ From b9a3d3ef05f5680344aab859edc416dd655b11ac Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 27 May 2022 19:26:06 +0800 Subject: [PATCH 7/7] MSVC Projects: Build widget factory demo Build the widget factory demo in the Visual Studio projects, and install the icon files that it needs. --- win32/install-msvc.mak | 3 +- win32/vs10/Makefile.am | 2 + win32/vs10/gtk+.sln | 18 ++ win32/vs10/gtk3-install.vcxproj | 4 + win32/vs10/gtk3-widget-factory.vcxproj | 98 ++++++++++ .../vs10/gtk3-widget-factory.vcxproj.filters | 20 ++ win32/vs11/Makefile.am | 2 + win32/vs12/Makefile.am | 2 + win32/vs14/Makefile.am | 2 + win32/vs15/Makefile.am | 2 + win32/vs16/Makefile.am | 2 + win32/vs17/Makefile.am | 2 + win32/vs9/Makefile.am | 1 + win32/vs9/gtk+.sln | 23 +++ win32/vs9/gtk3-widget-factory.vcproj | 184 ++++++++++++++++++ 15 files changed, 364 insertions(+), 1 deletion(-) create mode 100644 win32/vs10/gtk3-widget-factory.vcxproj create mode 100644 win32/vs10/gtk3-widget-factory.vcxproj.filters create mode 100644 win32/vs9/gtk3-widget-factory.vcproj diff --git a/win32/install-msvc.mak b/win32/install-msvc.mak index 4bd136feb4..46d8ff61fb 100644 --- a/win32/install-msvc.mak +++ b/win32/install-msvc.mak @@ -29,7 +29,7 @@ GTK_LIB = $(BASE_BUILT_BIN_DIR)\gtk-$(IMPLIB_SUFFIX) LIBGAIL_UTIL_DLL_FILENAME = gailutil-$(GTK_API_VERSION)-vs$(VSVER) LIBGAIL_UTIL_LIB = $(BASE_BUILT_BIN_DIR)\gailutil-$(IMPLIB_SUFFIX) GTK_PROGRAMS_NAMES = builder-tool encode-symbolic-svg query-settings update-icon-cache -GTK3_PROGRAMS_NAMES = demo demo-application icon-browser +GTK3_PROGRAMS_NAMES = demo demo-application icon-browser widget-factory GDK_GIR_FILE = $(BASE_BUILT_BIN_DIR)\Gdk-$(IMPLIB_SUFFIX:.lib=.gir) GDKWIN32_GIR_FILE = $(BASE_BUILT_BIN_DIR)\GdkWin32-$(IMPLIB_SUFFIX:.lib=.gir) GTK_GIR_FILE = $(BASE_BUILT_BIN_DIR)\Gtk-$(IMPLIB_SUFFIX:.lib=.gir) @@ -123,4 +123,5 @@ install-data: @-$(GLIB_COMPILE_SCHEMAS) $(PREFIX)\share\glib-2.0\schemas # Demo icons @for %t in (16 22 24 32 48 256) do @for %d in ($(PREFIX)\share\icons\hicolor\%tx%t\apps) do @((if not exist %d\ mkdir %d) & copy /b ..\demos\gtk-demo\data\%tx%t\gtk3-demo.png "%d") + @for %t in (16 22 24 32 48 256) do @for %d in ($(PREFIX)\share\icons\hicolor\%tx%t\apps) do @((if not exist %d\ mkdir %d) & copy /b ..\demos\widget-factory\data\%tx%t\gtk3-widget-factory*.png "%d") @-$(BASE_BUILT_BIN_DIR)\gtk-update-icon-cache.exe --ignore-theme-index --force "$(PREFIX)\share\icons\hicolor" diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am index e0967aa30a..37346a8f77 100644 --- a/win32/vs10/Makefile.am +++ b/win32/vs10/Makefile.am @@ -44,6 +44,8 @@ EXTRA_DIST += \ gtk3-demo-application.vcxproj.filters \ gtk3-icon-browser.vcxproj \ gtk3-icon-browser.vcxproj.filters \ + gtk3-widget-factory.vcxproj \ + gtk3-widget-factory.vcxproj.filters \ gailutil-3.vcxprojin \ gailutil-3.vcxproj.filtersin \ gtk3-install.vcxproj \ diff --git a/win32/vs10/gtk+.sln b/win32/vs10/gtk+.sln index 841f7233bb..7fadabdc7c 100644 --- a/win32/vs10/gtk+.sln +++ b/win32/vs10/gtk+.sln @@ -18,6 +18,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo-application", "gt EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-icon-browser", "gtk3-icon-browser.vcxproj", "{343333C4-D46C-4C97-A986-959CCA6F1DE0}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-widget-factory", "gtk3-widget-factory.vcxproj", "{BE6B4973-C6FF-4C8F-8E97-A70793C50F44}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-encode-symbolic-svg", "gtk-encode-symbolic-svg.vcxproj", "{F280BF1A-777A-4FB5-8005-DFBE04621EDB}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil-3", "gailutil-3.vcxproj", "{A1FCED61-4E51-4015-A70C-5373404D1BA0}" @@ -228,6 +230,22 @@ Global {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|Win32.Build.0 = Release|Win32 {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|x64.ActiveCfg = Release|x64 {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|x64.Build.0 = Release|x64 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug|Win32.ActiveCfg = Debug|Win32 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug|Win32.Build.0 = Debug|Win32 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug|x64.ActiveCfg = Debug|x64 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug|x64.Build.0 = Debug|x64 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release|Win32.ActiveCfg = Release|Win32 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release|Win32.Build.0 = Release|Win32 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release|x64.ActiveCfg = Release|x64 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release|x64.Build.0 = Release|x64 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug_Broadway|Win32.Build.0 = Debug|Win32 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug_Broadway|x64.ActiveCfg = Debug|x64 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug_Broadway|x64.Build.0 = Debug|x64 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release_Broadway|Win32.ActiveCfg = Release|Win32 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release_Broadway|Win32.Build.0 = Release|Win32 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release_Broadway|x64.ActiveCfg = Release|x64 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release_Broadway|x64.Build.0 = Release|x64 {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|Win32.ActiveCfg = Debug|Win32 {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|Win32.Build.0 = Debug|Win32 {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/win32/vs10/gtk3-install.vcxproj b/win32/vs10/gtk3-install.vcxproj index 588515d8aa..c2b2725879 100644 --- a/win32/vs10/gtk3-install.vcxproj +++ b/win32/vs10/gtk3-install.vcxproj @@ -84,6 +84,10 @@ {343333c4-d46c-4c97-a986-959cca6f1de0} false + + {be6b4973-c6ff-4c8f-8e97-a70793c50f44} + false + {e9687d21-e214-4a0c-9eb4-8b38ebb783e5} false diff --git a/win32/vs10/gtk3-widget-factory.vcxproj b/win32/vs10/gtk3-widget-factory.vcxproj new file mode 100644 index 0000000000..00d3d0bbbc --- /dev/null +++ b/win32/vs10/gtk3-widget-factory.vcxproj @@ -0,0 +1,98 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44} + gtk3widgetfactory + Win32Proj + + + + Application + MultiByte + true + v100 + + + + + + + + + + + true + false + + + + $(BaseConfigIncludes);%(AdditionalIncludeDirectories) + + Level3 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + EditAndContinue + ProgramDatabase + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + false + ProgramDatabase + + + true + Console + atk-1.0.lib;%(AdditionalDependencies) + + + true + true + + MachineX86 + MachineX64 + + + + + + + + + {5ae8f5ce-9103-4951-aede-ea2f3b573be8} + false + + + {95a4b53d-2773-4406-a2c1-8fd2840bbad8} + false + + + + + + diff --git a/win32/vs10/gtk3-widget-factory.vcxproj.filters b/win32/vs10/gtk3-widget-factory.vcxproj.filters new file mode 100644 index 0000000000..dd38d00b49 --- /dev/null +++ b/win32/vs10/gtk3-widget-factory.vcxproj.filters @@ -0,0 +1,20 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + Source Files + + diff --git a/win32/vs11/Makefile.am b/win32/vs11/Makefile.am index c95331e099..064aa41179 100644 --- a/win32/vs11/Makefile.am +++ b/win32/vs11/Makefile.am @@ -24,6 +24,8 @@ EXTRA_DIST += \ gtk3-demo-application.vcxproj.filters \ gtk3-icon-browser.vcxproj \ gtk3-icon-browser.vcxproj.filters \ + gtk3-widget-factory.vcxproj \ + gtk3-widget-factory.vcxproj.filters \ gailutil-3.vcxproj \ gailutil-3.vcxproj.filters \ gtk3-install.vcxproj \ diff --git a/win32/vs12/Makefile.am b/win32/vs12/Makefile.am index 4e669865be..89221cf1a1 100644 --- a/win32/vs12/Makefile.am +++ b/win32/vs12/Makefile.am @@ -24,6 +24,8 @@ EXTRA_DIST += \ gtk3-demo-application.vcxproj.filters \ gtk3-icon-browser.vcxproj \ gtk3-icon-browser.vcxproj.filters \ + gtk3-widget-factory.vcxproj \ + gtk3-widget-factory.vcxproj.filters \ gailutil-3.vcxproj \ gailutil-3.vcxproj.filters \ gtk3-install.vcxproj \ diff --git a/win32/vs14/Makefile.am b/win32/vs14/Makefile.am index ac099944c3..a4d8b1c3a6 100644 --- a/win32/vs14/Makefile.am +++ b/win32/vs14/Makefile.am @@ -24,6 +24,8 @@ EXTRA_DIST += \ gtk3-demo-application.vcxproj.filters \ gtk3-icon-browser.vcxproj \ gtk3-icon-browser.vcxproj.filters \ + gtk3-widget-factory.vcxproj \ + gtk3-widget-factory.vcxproj.filters \ gailutil-3.vcxproj \ gailutil-3.vcxproj.filters \ gtk3-install.vcxproj \ diff --git a/win32/vs15/Makefile.am b/win32/vs15/Makefile.am index 8a95e9eae9..93fd1fbbb1 100644 --- a/win32/vs15/Makefile.am +++ b/win32/vs15/Makefile.am @@ -24,6 +24,8 @@ EXTRA_DIST_COPIED = \ gtk3-demo-application.vcxproj.filters \ gtk3-icon-browser.vcxproj \ gtk3-icon-browser.vcxproj.filters \ + gtk3-widget-factory.vcxproj \ + gtk3-widget-factory.vcxproj.filters \ gailutil-3.vcxproj \ gailutil-3.vcxproj.filters \ gtk3-install.vcxproj \ diff --git a/win32/vs16/Makefile.am b/win32/vs16/Makefile.am index 6bdff1695a..9ddd5f0773 100644 --- a/win32/vs16/Makefile.am +++ b/win32/vs16/Makefile.am @@ -24,6 +24,8 @@ EXTRA_DIST += \ gtk3-demo-application.vcxproj.filters \ gtk3-icon-browser.vcxproj \ gtk3-icon-browser.vcxproj.filters \ + gtk3-widget-factory.vcxproj \ + gtk3-widget-factory.vcxproj.filters \ gailutil-3.vcxproj \ gailutil-3.vcxproj.filters \ gtk3-install.vcxproj \ diff --git a/win32/vs17/Makefile.am b/win32/vs17/Makefile.am index 0ddde0d50e..98118ea995 100644 --- a/win32/vs17/Makefile.am +++ b/win32/vs17/Makefile.am @@ -24,6 +24,8 @@ EXTRA_DIST += \ gtk3-demo-application.vcxproj.filters \ gtk3-icon-browser.vcxproj \ gtk3-icon-browser.vcxproj.filters \ + gtk3-widget-factory.vcxproj \ + gtk3-widget-factory.vcxproj.filters \ gailutil-3.vcxproj \ gailutil-3.vcxproj.filters \ gtk3-install.vcxproj \ diff --git a/win32/vs9/Makefile.am b/win32/vs9/Makefile.am index 063c579f89..7fafa1f9f9 100644 --- a/win32/vs9/Makefile.am +++ b/win32/vs9/Makefile.am @@ -24,6 +24,7 @@ EXTRA_DIST += \ gtk3-demo.vcprojin \ gtk3-demo-application.vcproj \ gtk3-icon-browser.vcproj \ + gtk3-widget-factory.vcproj \ gailutil-3.vcprojin \ gtk3-install.vcproj \ gtk3-introspect.vcproj \ diff --git a/win32/vs9/gtk+.sln b/win32/vs9/gtk+.sln index d86ef9ad31..675836f999 100644 --- a/win32/vs9/gtk+.sln +++ b/win32/vs9/gtk+.sln @@ -51,6 +51,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-icon-browser", "gtk3-i {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-widget-factory", "gtk3-widget-factory.vcproj", "{BE6B4973-C6FF-4C8F-8E97-A70793C50F44}" + ProjectSection(ProjectDependencies) = postProject + {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} + {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8} + EndProjectSection +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil-3", "gailutil-3.vcproj", "{A1FCED61-4E51-4015-A70C-5373404D1BA0}" ProjectSection(ProjectDependencies) = postProject {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} @@ -84,6 +90,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-install", "gtk3-instal {343333C4-D46C-4C97-A986-959CCA6F1DE0} = {343333C4-D46C-4C97-A986-959CCA6F1DE0} {E9687D21-E214-4A0C-9EB4-8B38EBB783E5} = {E9687D21-E214-4A0C-9EB4-8B38EBB783E5} {F280BF1A-777A-4FB5-8005-DFBE04621EDB} = {F280BF1A-777A-4FB5-8005-DFBE04621EDB} + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44} = {BE6B4973-C6FF-4C8F-8E97-A70793C50F44} {FC98AF16-4C68-42DF-906B-93A6804C198A} = {FC98AF16-4C68-42DF-906B-93A6804C198A} {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD} = {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD} {9F22107A-3EF7-4B52-B269-747B65307F36} = {9F22107A-3EF7-4B52-B269-747B65307F36} @@ -283,6 +290,22 @@ Global {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|Win32.Build.0 = Release|Win32 {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|x64.ActiveCfg = Release|x64 {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|x64.Build.0 = Release|x64 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug|Win32.ActiveCfg = Debug|Win32 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug|Win32.Build.0 = Debug|Win32 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug|x64.ActiveCfg = Debug|x64 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug|x64.Build.0 = Debug|x64 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release|Win32.ActiveCfg = Release|Win32 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release|Win32.Build.0 = Release|Win32 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release|x64.ActiveCfg = Release|x64 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release|x64.Build.0 = Release|x64 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug_Broadway|Win32.Build.0 = Debug|Win32 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug_Broadway|x64.ActiveCfg = Debug|x64 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Debug_Broadway|x64.Build.0 = Debug|x64 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release_Broadway|Win32.ActiveCfg = Release|Win32 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release_Broadway|Win32.Build.0 = Release|Win32 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release_Broadway|x64.ActiveCfg = Release|x64 + {BE6B4973-C6FF-4C8F-8E97-A70793C50F44}.Release_Broadway|x64.Build.0 = Release|x64 {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|Win32.ActiveCfg = Debug|Win32 {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|Win32.Build.0 = Debug|Win32 {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/win32/vs9/gtk3-widget-factory.vcproj b/win32/vs9/gtk3-widget-factory.vcproj new file mode 100644 index 0000000000..7efb335c5a --- /dev/null +++ b/win32/vs9/gtk3-widget-factory.vcproj @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +