[gtk/gtk-3-24] MSVC projects: Use NMake to generate the sources in gtk/
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/gtk-3-24] MSVC projects: Use NMake to generate the sources in gtk/
- Date: Mon, 29 Jul 2019 08:31:07 +0000 (UTC)
commit b9d9c59afa2715655444ec535f10eb23c13cd50b
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Mon Jul 29 16:27:22 2019 +0800
MSVC projects: Use NMake to generate the sources in gtk/
...instead of in the gtk-3 project. This will also make the project
files a bit cleaner. Note that this commit only moves all the source
code generating steps in the gtk-3 into the NMake Makefile, and so
generate those sources in the gtk3-prebuild project.
build/win32/config-msvc.mak.in | 46 ++++++++++++
build/win32/generate-msvc.mak | 52 ++++++++++++--
build/win32/vs10/gtk-3.vcxproj.filtersin | 6 --
build/win32/vs10/gtk-3.vcxprojin | 22 ------
build/win32/vs10/gtk3-gen-srcs.props | 24 ++-----
build/win32/vs10/gtk3-prebuild.vcxproj | 1 -
build/win32/vs9/gtk-3.vcprojin | 120 -------------------------------
build/win32/vs9/gtk3-gen-srcs.vsprops | 48 ++-----------
build/win32/vs9/gtk3-prebuild.vcproj | 16 ++---
9 files changed, 109 insertions(+), 226 deletions(-)
---
diff --git a/build/win32/config-msvc.mak.in b/build/win32/config-msvc.mak.in
index c0004167f1..c1d0b62f1d 100644
--- a/build/win32/config-msvc.mak.in
+++ b/build/win32/config-msvc.mak.in
@@ -30,3 +30,49 @@ GDBUS_CODEGEN = $(PREFIX)\bin\gdbus-codegen
# Please do not change anything beneath this line unless maintaining the NMake Makefiles
GTK_VERSION = @GTK_VERSION@
+
+GTK_PREPROCESSOR_FLAGS = \
+ /I..\..\gtk \
+ /I..\..\gdk \
+ /I..\..\gdk\win32 \
+ /I..\.. \
+ /I$(PREFIX)\include\gdk-pixbuf-2.0 \
+ /I$(PREFIX)\include\pango-1.0 \
+ /I$(PREFIX)\include\atk-1.0 \
+ /I$(PREFIX)\include\cairo \
+ /I$(PREFIX)\include\gio-win32-2.0 \
+ /I$(PREFIX)\include\glib-2.0 \
+ /I$(PREFIX)\lib\glib-2.0\include \
+ /I$(PREFIX)\include \
+ /DHAVE_CONFIG_H \
+ /DG_DISABLE_SINGLE_INCLUDES \
+ /DATK_DISABLE_SINGLE_INCLUDES \
+ /DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
+ /DGTK_DISABLE_SINGLE_INCLUDES \
+ /D_USE_MATH_DEFINES \
+ /DGTK_COMPILATION \
+ /DG_LOG_DOMAIN=\"Gtk\" \
+ /DGTK_HOST=\"i686-pc-vs$(VSVER)\" \
+ /DGTK_PRINT_BACKENDS=\"file\" \
+ /DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
+ /DINCLUDE_IM_am_et \
+ /DINCLUDE_IM_cedilla \
+ /DINCLUDE_IM_cyrillic_translit \
+ /DINCLUDE_IM_ime \
+ /DINCLUDE_IM_inuktitut \
+ /DINCLUDE_IM_ipa \
+ /DINCLUDE_IM_multipress \
+ /DINCLUDE_IM_thai \
+ /DINCLUDE_IM_ti_er \
+ /DINCLUDE_IM_ti_et \
+ /DINCLUDE_IM_viqr \
+ /DGTK_LIBDIR=\"$(PREFIX:\=/)/lib\" \
+ /DGTK_DATADIR=\"$(PREFIX:\=/)/share\" \
+ /DGTK_DATA_PREFIX=\"$(PREFIX:\=/)\" \
+ /DGTK_SYSCONFDIR=\"$(PREFIX:\=/)/etc\" \
+ /DMULTIPRESS_CONFDIR=\"$(PREFIX:\=/)/etc/gtk-3.0\" \
+ /DMULTIPRESS_LOCALEDIR=\"$(PREFIX:\=/)/share/locale\" \
+ /DGTK_VERSION=\"$(GTK_VERSION)\" \
+ /DGTK_BINARY_VERSION=\"3.0.0\" \
+ /DGDK_DISABLE_DEPRECATED \
+ /DISOLATION_AWARE_ENABLED
diff --git a/build/win32/generate-msvc.mak b/build/win32/generate-msvc.mak
index 10b39b6256..e7351104e3 100644
--- a/build/win32/generate-msvc.mak
+++ b/build/win32/generate-msvc.mak
@@ -45,11 +45,17 @@ all: \
..\..\gdk\gdkmarshalers.c \
..\..\gdk\gdkresources.h \
..\..\gdk\gdkresources.c \
+ ..\..\gtk\gtk-win32.rc \
+ ..\..\gtk\libgtk3.manifest \
+ ..\..\gtk\gtkdbusgenerated.h \
+ ..\..\gtk\gtkdbusgenerated.c \
+ ..\..\gtk\gtktypefuncs.inc \
..\..\demos\gtk-demo\demos.h
# Copy the pre-defined config.h.win32 and demos.h.win32
..\..\config.h: ..\..\config.h.win32
..\..\demos\gtk-demo\demos.h: ..\..\demos\gtk-demo\demos.h.win32
+..\..\gtk\gtk-win32.rc: ..\..\gtk\gtk-win32.rc.body
..\..\gdk-$(CFG)-$(GDK_CONFIG)-build: $(GDK_CONFIG_TEMPLATE)
@if exist ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build del
..\..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build
@@ -61,21 +67,27 @@ all: \
..\..\config.h \
..\..\gdk\gdkconfig.h \
+..\..\gtk\gtk-win32.rc \
..\..\demos\gtk-demo\demos.h:
+ @echo Copying $@...
@copy $** $@
..\..\gdk\gdkversionmacros.h: ..\..\gdk\gdkversionmacros.h.in
- $(PYTHON) gen-gdkversionmacros-h.py --version=$(GTK_VERSION)
+ @echo Generating $@...
+ @$(PYTHON) gen-gdkversionmacros-h.py --version=$(GTK_VERSION)
..\..\gdk\gdkmarshalers.h: ..\..\gdk\gdkmarshalers.list
- $(PYTHON) $(GLIB_GENMARSHAL) $(GDK_MARSHALERS_FLAGS) --header $** > $@.tmp
+ @echo Generating $@...
+ @$(PYTHON) $(GLIB_GENMARSHAL) $(GDK_MARSHALERS_FLAGS) --header $** > $@.tmp
@move $@.tmp $@
..\..\gdk\gdkmarshalers.c: ..\..\gdk\gdkmarshalers.list
- $(PYTHON) $(GLIB_GENMARSHAL) $(GDK_MARSHALERS_FLAGS) --body $** > $@.tmp
+ @echo Generating $@...
+ @$(PYTHON) $(GLIB_GENMARSHAL) $(GDK_MARSHALERS_FLAGS) --body $** > $@.tmp
@move $@.tmp $@
..\..\gdk\gdk.gresource.xml:
+ @echo Generating $@...
@echo ^<?xml version='1.0' encoding='UTF-8'?^> >$@
@echo ^<gresources^> >> $@
@echo ^<gresource prefix='/org/gtk/libgdk'^> >> $@
@@ -84,14 +96,44 @@ all: \
@echo ^</gresources^> >> $@
..\..\gdk\gdkresources.h: ..\..\gdk\gdk.gresource.xml
- $(GLIB_COMPILE_RESOURCES) $(GDK_RESOURCES_ARGS) --generate-header
+ @echo Generating $@...
+ @$(GLIB_COMPILE_RESOURCES) $(GDK_RESOURCES_ARGS) --generate-header
..\..\gdk\gdkresources.c: ..\..\gdk\gdk.gresource.xml $(GDK_RESOURCES)
- $(GLIB_COMPILE_RESOURCES) $(GDK_RESOURCES_ARGS) --generate-source
+ @echo Generating $@...
+ @$(GLIB_COMPILE_RESOURCES) $(GDK_RESOURCES_ARGS) --generate-source
+
+..\..\gtk\libgtk3.manifest: ..\..\gtk\libgtk3.manifest.in
+ @echo Generating $@...
+ @$(PYTHON) replace.py \
+ --action=replace-var \
+ --input=$** --output=$@ \
+ --var=EXE_MANIFEST_ARCHITECTURE \
+ --outstring=*
+
+..\..\gtk\gtkdbusgenerated.h ..\..\gtk\gtkdbusgenerated.c: ..\..\gtk\gtkdbusinterfaces.xml
+ @echo Generating GTK DBus sources...
+ @$(PYTHON) $(PREFIX)\bin\gdbus-codegen \
+ --interface-prefix org.Gtk. --c-namespace _Gtk \
+ --generate-c-code gtkdbusgenerated $** \
+ --output-directory $(@D)
+
+..\..\gtk\gtktypefuncs.inc: ..\..\gtk\gentypefuncs.py
+ @echo Generating $@...
+ @echo #undef GTK_COMPILATION > $(@R).preproc.c
+ @echo #include "gtkx.h" >> $(@R).preproc.c
+ @cl /EP $(GTK_PREPROCESSOR_FLAGS) $(@R).preproc.c > $(@R).combined.c
+ @$(PYTHON) $** $@ $(@R).combined.c
+ @del $(@R).preproc.c $(@R).combined.c
# Remove the generated files
clean:
+ @-del /f /q ..\..\gtk\gtktypefuncs.inc
+ @-del /f /q ..\..\gtk\gtkdbusgenerated.c
+ @-del /f /q ..\..\gtk\gtkdbusgenerated.h
@-del /f /q ..\..\demos\gtk-demo\demos.h
+ @-del /f /q ..\..\gtk\libgtk3.manifest
+ @-del /f /q ..\..\gtk\gtk-win32.rc
@-del /f /q ..\..\gdk\gdkresources.c
@-del /f /q ..\..\gdk\gdkresources.h
@-del /f /q ..\..\gdk\gdk.gresource.xml
diff --git a/build/win32/vs10/gtk-3.vcxproj.filtersin b/build/win32/vs10/gtk-3.vcxproj.filtersin
index b672d9b476..861d6d0d02 100644
--- a/build/win32/vs10/gtk-3.vcxproj.filtersin
+++ b/build/win32/vs10/gtk-3.vcxproj.filtersin
@@ -17,12 +17,6 @@
<ItemGroup>
<ResourceCompile Include="..\..\..\gtk\gtk-win32.rc"><Filter>Resource Files</Filter></ResourceCompile>
</ItemGroup>
- <ItemGroup>
- <CustomBuild Include="..\..\..\gtk\gtkdbusinterfaces.xml"><Filter>Resource Files</Filter></CustomBuild>
- <CustomBuild Include="..\..\..\gtk\gtk-win32.rc.body"><Filter>Resource Files</Filter></CustomBuild>
- <CustomBuild Include="..\..\..\gtk\libgtk3.manifest.in"><Filter>Resource Files</Filter></CustomBuild>
- <CustomBuild Include="..\..\..\gtk\gentypefuncs.py"><Filter>Resource Files</Filter></CustomBuild>
- </ItemGroup>
<ItemGroup>
#include "gtk-3.vs10.sourcefiles.filters"
<ClCompile Include="..\..\..\modules\input\gtkimcontextime.c"><Filter>Source Files</Filter></ClCompile>
diff --git a/build/win32/vs10/gtk-3.vcxprojin b/build/win32/vs10/gtk-3.vcxprojin
index c5629ccbd2..a528a4383c 100644
--- a/build/win32/vs10/gtk-3.vcxprojin
+++ b/build/win32/vs10/gtk-3.vcxprojin
@@ -162,28 +162,6 @@
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
- <ItemGroup>
- <CustomBuild Include="..\..\..\gtk\gtkdbusinterfaces.xml">
- <Message>Generating GTK+ DBus Sources...</Message>
- <Command>$(GenerateGtkDbusBuiltSources)</Command>
- <Outputs>..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\..\..\gtk\gtk-win32.rc.body">
- <Message>Copying GTK+ Win32 Version Resource...</Message>
- <Command>$(CopyGtkWin32RC)</Command>
- <Outputs>..\..\..\gtk\gtk-win32.rc;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\..\..\gtk\libgtk3.manifest.in">
- <Message>Generating GTK+ Win32 Manifest...</Message>
- <Command>$(GenerateGtkWin32Manifest)</Command>
- <Outputs>..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\..\..\gtk\gentypefuncs.py">
- <Message>Generating ..\..\..\gtk\gtktypefuncs.inc</Message>
- <Command>$(GenerateTypeFuncs)</Command>
- <Outputs>..\..\..\gtk\gtktypefuncs.inc</Outputs>
- </CustomBuild>
- </ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\gtk\gtk-win32.rc" />
</ItemGroup>
diff --git a/build/win32/vs10/gtk3-gen-srcs.props b/build/win32/vs10/gtk3-gen-srcs.props
index ca9414a26f..0e43e8b2f2 100644
--- a/build/win32/vs10/gtk3-gen-srcs.props
+++ b/build/win32/vs10/gtk3-gen-srcs.props
@@ -8,12 +8,8 @@
set VCInstallDir=$(VCInstallDir)
nmake -f generate-msvc.mak PREFIX=$(GlibEtcInstallRoot)</GenerateRequiredSourcesBase>
<GeneratedGdkSources>..\..\..\config.h;..\..\..\gdk\gdkconfig.h;..\..\gdk\gdkversionmacros.h;..\..\..\gdk\gdkmarshalers.h;..\..\..\gdk\gdkmarshalers.c;..\..\..\gdk\gdkresources.h;..\..\..\gdk\gdkresources.c</GeneratedGdkSources>
+
<GeneratedGtkSources>..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest;..\..\..\gtk\gtkdbusgenerated.h;..\..\..\gtk\gtkdbusgenerated.c</GeneratedGtkSources>
<GeneratedDemoSources>..\..\..\demos\gtk-demo\demos.h</GeneratedDemoSources>
- <GDbusCodeGenCmd>$(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk
--generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml</GDbusCodeGenCmd>
- <GenerateGtkDbusBuiltSources>cd ..\..\..\gtk & $(PythonDir)\python $(GDbusCodeGenCmd) & cd
$(SolutionDir)</GenerateGtkDbusBuiltSources>
- <CopyGtkWin32RC>copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc</CopyGtkWin32RC>
- <GenerateGtkWin32Manifest>$(PythonDir)\python ..\replace.py --action=replace-var
--input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest
--var=EXE_MANIFEST_ARCHITECTURE --outstring=*</GenerateGtkWin32Manifest>
- <CopyDemosH>copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h</CopyDemosH>
<GenerateTypeFuncs>
echo #undef GTK_COMPILATION > ..\..\..\gtk\gtktypefuncs.preproc.c
echo #include "gtkx.h" >> ..\..\..\gtk\gtktypefuncs.preproc.c
@@ -32,24 +28,12 @@ del ..\..\..\gtk\gtktypefuncs.combined.c ..\..\..\gtk\gtktypefuncs.preproc.c
<BuildMacro Include="GeneratedGdkSources">
<Value>$(GeneratedGdkSources)</Value>
</BuildMacro>
+ <BuildMacro Include="GeneratedGtkSources">
+ <Value>$(GeneratedGtkSources)</Value>
+ </BuildMacro>
<BuildMacro Include="GeneratedDemoSources">
<Value>$(GeneratedDemoSources)</Value>
</BuildMacro>
- <BuildMacro Include="GDbusCodeGenCmd">
- <Value>$(GDbusCodeGenCmd)</Value>
- </BuildMacro>
- <BuildMacro Include="GenerateGtkDbusBuiltSources">
- <Value>$(GenerateGtkDbusBuiltSources)</Value>
- </BuildMacro>
- <BuildMacro Include="CopyGtkWin32RC">
- <Value>$(CopyGtkWin32RC)</Value>
- </BuildMacro>
- <BuildMacro Include="GenerateGtkWin32Manifest">
- <Value>$(GenerateGtkWin32Manifest)</Value>
- </BuildMacro>
- <BuildMacro Include="CopyDemosH">
- <Value>$(CopyDemosH)</Value>
- </BuildMacro>
<BuildMacro Include="GenerateTypeFuncs">
<Value>$(GenerateTypeFuncs)</Value>
</BuildMacro>
diff --git a/build/win32/vs10/gtk3-prebuild.vcxproj b/build/win32/vs10/gtk3-prebuild.vcxproj
index 60615a340d..3f1e73bc6a 100644
--- a/build/win32/vs10/gtk3-prebuild.vcxproj
+++ b/build/win32/vs10/gtk3-prebuild.vcxproj
@@ -133,7 +133,6 @@
<NMakeCleanCommandLine Condition="'$(Configuration)' ==
'Release_Broadway'">$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam)
clean</NMakeCleanCommandLine>
<NMakeCleanCommandLine Condition="'$(Configuration)' == 'Debug'">$(GenerateRequiredSourcesBase)
CFG=$(Configuration) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
<NMakeCleanCommandLine Condition="'$(Configuration)' == 'Release'">$(GenerateRequiredSourcesBase)
CFG=$(Configuration) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
- <NMakeOutput>$(GeneratedGdkSources);$(GeneratedDemoSources)</NMakeOutput>
</PropertyGroup>
<ItemGroup>
</ItemGroup>
diff --git a/build/win32/vs9/gtk-3.vcprojin b/build/win32/vs9/gtk-3.vcprojin
index 55218a7573..112ab5aff1 100644
--- a/build/win32/vs9/gtk-3.vcprojin
+++ b/build/win32/vs9/gtk-3.vcprojin
@@ -162,126 +162,6 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
- <File RelativePath="..\..\..\gtk\gtkdbusinterfaces.xml">
- <FileConfiguration Name="Debug|Win32">
- <Tool Name="VCCustomBuildTool"
- Description="Generating GTK+ DBus Sources..."
- CommandLine="$(GenerateGtkDbusBuiltSources)"
-
Outputs="..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h"
- />
- </FileConfiguration>
- <FileConfiguration Name="Release|Win32">
- <Tool Name="VCCustomBuildTool"
- Description="Generating GTK+ DBus Sources..."
- CommandLine="$(GenerateGtkDbusBuiltSources)"
-
Outputs="..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h"
- />
- </FileConfiguration>
- <FileConfiguration Name="Debug|x64">
- <Tool Name="VCCustomBuildTool"
- Description="Generating GTK+ DBus Sources..."
- CommandLine="$(GenerateGtkDbusBuiltSourcesX64)"
-
Outputs="..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h"
- />
- </FileConfiguration>
- <FileConfiguration Name="Release|x64">
- <Tool Name="VCCustomBuildTool"
- Description="Generating GTK+ DBus Sources..."
- CommandLine="$(GenerateGtkDbusBuiltSourcesX64)"
-
Outputs="..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h"
- />
- </FileConfiguration>
- </File>
- <File RelativePath="..\..\..\gtk\gtk-win32.rc.body">
- <FileConfiguration Name="Debug|Win32">
- <Tool Name="VCCustomBuildTool"
- Description="Copying GTK+ Win32 Version Resource..."
- CommandLine="$(CopyGtkWin32RC)"
- Outputs="..\..\..\gtk\gtk-win32.rc"
- />
- </FileConfiguration>
- <FileConfiguration Name="Release|Win32">
- <Tool Name="VCCustomBuildTool"
- Description="Copying GTK+ Win32 Version Resource..."
- CommandLine="$(CopyGtkWin32RC)"
- Outputs="..\..\..\gtk\gtk-win32.rc"
- />
- </FileConfiguration>
- <FileConfiguration Name="Debug|x64">
- <Tool Name="VCCustomBuildTool"
- Description="Copying GTK+ Win32 Version Resource..."
- CommandLine="$(CopyGtkWin32RC)"
- Outputs="..\..\..\gtk\gtk-win32.rc"
- />
- </FileConfiguration>
- <FileConfiguration Name="Release|x64">
- <Tool Name="VCCustomBuildTool"
- Description="Copying GTK+ Win32 Version Resource..."
- CommandLine="$(CopyGtkWin32RC)"
- Outputs="..\..\..\gtk\gtk-win32.rc"
- />
- </FileConfiguration>
- </File>
- <File RelativePath="..\..\..\gtk\libgtk3.manifest.in">
- <FileConfiguration Name="Debug|Win32">
- <Tool Name="VCCustomBuildTool"
- Description="Generating GTK+ Win32 Manifest..."
- CommandLine="$(GenerateGtkWin32Manifest)"
- Outputs="..\..\..\gtk\libgtk3.manifest"
- />
- </FileConfiguration>
- <FileConfiguration Name="Release|Win32">
- <Tool Name="VCCustomBuildTool"
- Description="Generating GTK+ Win32 Manifest..."
- CommandLine="$(GenerateGtkWin32Manifest)"
- Outputs="..\..\..\gtk\libgtk3.manifest"
- />
- </FileConfiguration>
- <FileConfiguration Name="Debug|x64">
- <Tool Name="VCCustomBuildTool"
- Description="Generating GTK+ Win32 Manifest..."
- CommandLine="$(GenerateGtkWin32Manifest)"
- Outputs="..\..\..\gtk\libgtk3.manifest"
- />
- </FileConfiguration>
- <FileConfiguration Name="Release|x64">
- <Tool Name="VCCustomBuildTool"
- Description="Generating GTK+ Win32 Manifest..."
- CommandLine="$(GenerateGtkWin32Manifest)"
- Outputs="..\..\..\gtk\libgtk3.manifest"
- />
- </FileConfiguration>
- </File>
- <File RelativePath="..\..\..\gtk\gentypefuncs.py">
- <FileConfiguration Name="Debug|Win32">
- <Tool Name="VCCustomBuildTool"
- Description="Generating ..\..\..\gtk\gtktypefuncs.inc..."
- CommandLine="$(GenerateTypeFuncs)"
- Outputs="..\..\..\gtk\gtktypefuncs.inc"
- />
- </FileConfiguration>
- <FileConfiguration Name="Release|Win32">
- <Tool Name="VCCustomBuildTool"
- Description="Generating ..\..\..\gtk\gtktypefuncs.inc..."
- CommandLine="$(GenerateTypeFuncs)"
- Outputs="..\..\..\gtk\gtktypefuncs.inc"
- />
- </FileConfiguration>
- <FileConfiguration Name="Debug|x64">
- <Tool Name="VCCustomBuildTool"
- Description="Generating ..\..\..\gtk\gtktypefuncs.inc..."
- CommandLine="$(GenerateTypeFuncsX64)"
- Outputs="..\..\..\gtk\gtktypefuncs.inc"
- />
- </FileConfiguration>
- <FileConfiguration Name="Release|x64">
- <Tool Name="VCCustomBuildTool"
- Description="Generating ..\..\..\gtk\gtktypefuncs.inc..."
- CommandLine="$(GenerateTypeFuncsX64)"
- Outputs="..\..\..\gtk\gtktypefuncs.inc"
- />
- </FileConfiguration>
- </File>
<File RelativePath="..\..\..\gtk\gtk-win32.rc" />
<File RelativePath="..\..\..\gtk\libgtk3.manifest" />
</Filter>
diff --git a/build/win32/vs9/gtk3-gen-srcs.vsprops b/build/win32/vs9/gtk3-gen-srcs.vsprops
index c4e84ddd3c..8e8f184750 100644
--- a/build/win32/vs9/gtk3-gen-srcs.vsprops
+++ b/build/win32/vs9/gtk3-gen-srcs.vsprops
@@ -14,51 +14,11 @@
Value="..\..\..\config.h;..\..\..\gdk\gdkconfig.h;..\..\gdk\gdkversionmacros.h;..\..\..\gdk\gdkmarshalers.h;..\..\..\gdk\gdkmarshalers.c;..\..\..\gdk\gdkresources.h;..\..\..\gdk\gdkresources.c"
/>
<UserMacro
- Name="GeneratedDemoSources"
- Value="..\..\..\demos\gtk-demo\demos.h"
- />
- <UserMacro
- Name="GDbusCodeGenCmd"
- Value="$(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk
--generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml"
- />
- <UserMacro
- Name="GenerateGtkDbusBuiltSources"
- Value="cd ..\..\..\gtk & $(PythonDir)\python $(GDbusCodeGenCmd) & cd $(SolutionDir)"
- />
- <UserMacro
- Name="GenerateGtkDbusBuiltSourcesX64"
- Value="cd ..\..\..\gtk & $(PythonDirX64)\python $(GDbusCodeGenCmd) & cd
$(SolutionDir)"
- />
- <UserMacro
- Name="CopyGtkWin32RC"
- Value="copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc"
- />
- <UserMacro
- Name="GenerateGtkWin32Manifest"
- Value="$(PythonDir)\python ..\replace.py --action=replace-var
--input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest
--var=EXE_MANIFEST_ARCHITECTURE --outstring=*"
- />
- <UserMacro
- Name="CopyDemosH"
- Value="copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h"
+ Name="GeneratedGtkSources"
+
Value="..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest;..\..\..\gtk\gtkdbusgenerated.h;..\..\..\gtk\gtkdbusgenerated.c"
/>
<UserMacro
- Name="GenerateTypeFuncs"
- Value="
-echo #undef GTK_COMPILATION > ..\..\..\gtk\gtktypefuncs.preproc.c

-echo #include "gtkx.h" >> ..\..\..\gtk\gtktypefuncs.preproc.c

-cl /EP /I..\..\..\gtk /I..\..\..\gdk /I..\..\..\gdk\win32 /I..\..\..
/I$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0 /I$(GlibEtcInstallRoot)\include\pango-1.0
/I$(GlibEtcInstallRoot)\include\atk-1.0 /I$(GlibEtcInstallRoot)\include\cairo
/I$(GlibEtcInstallRoot)\include\gio-win32-2.0 /I$(GlibEtcInstallRoot)\include\glib-2.0
/I$(GlibEtcInstallRoot)\lib\glib-2.0\include /I$(GlibEtcInstallRoot)\include /DHAVE_CONFIG_H
/DG_DISABLE_SINGLE_INCLUDES /DATK_DISABLE_SINGLE_INCLUDES /DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES
/DGTK_DISABLE_SINGLE_INCLUDES /D_USE_MATH_DEFINES /DINCLUDE_IM_am_et /DINCLUDE_IM_cedilla
/DINCLUDE_IM_cyrillic_translit /DINCLUDE_IM_ime /DINCLUDE_IM_inuktitut /DINCLUDE_IM_ipa
/DINCLUDE_IM_multipress /DINCLUDE_IM_thai /DINCLUDE_IM_ti_er /DINCLUDE_IM_ti_et /DINCLUDE_IM_viqr
/DGTK_COMPILATION /DG_LOG_DOMAIN=\"Gtk\" /DGTK_HOST=\"i686-pc-vs$(VSVer)\"
/DGTK_PRINT_BACKENDS=\"file\" /DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED /D$(GtkIncludedImmodulesDefi
nes) /DG
TK_LIBDIR=\"$(GtkDummyPrefix)/lib\" /DGTK_DATADIR=\"$(GtkDummyPrefix)/share\"
/DGTK_DATA_PREFIX=\"$(GtkDummyPrefix)\" /DGTK_SYSCONFDIR=\"$(GtkDummyPrefix)/etc\"
/DMULTIPRESS_CONFDIR=\"$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\"
/DMULTIPRESS_LOCALEDIR=\"$(GtkDummyPrefix)/share/locale\" /DGTK_VERSION=\"$(GtkVersion)\"
/DGTK_BINARY_VERSION=\"$(GtkBinaryVersion)\" /DGDK_DISABLE_DEPRECATED /DISOLATION_AWARE_ENABLED
..\..\..\gtk\gtktypefuncs.preproc.c > ..\..\..\gtk\gtktypefuncs.combined.c

-$(PythonDir)\python ..\..\..\gtk\gentypefuncs.py ..\..\..\gtk\gtktypefuncs.inc
..\..\..\gtk\gtktypefuncs.combined.c

-del ..\..\..\gtk\gtktypefuncs.combined.c ..\..\..\gtk\gtktypefuncs.preproc.c

- "
- />
- <UserMacro
- Name="GenerateTypeFuncsX64"
- Value="
-echo #undef GTK_COMPILATION > ..\..\..\gtk\gtktypefuncs.preproc.c

-echo #include "gtkx.h" >> ..\..\..\gtk\gtktypefuncs.preproc.c

-cl /EP /I..\..\..\gtk /I..\..\..\gdk /I..\..\..\gdk\win32 /I..\..\..
/I$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0 /I$(GlibEtcInstallRoot)\include\pango-1.0
/I$(GlibEtcInstallRoot)\include\atk-1.0 /I$(GlibEtcInstallRoot)\include\cairo
/I$(GlibEtcInstallRoot)\include\gio-win32-2.0 /I$(GlibEtcInstallRoot)\include\glib-2.0
/I$(GlibEtcInstallRoot)\lib\glib-2.0\include /I$(GlibEtcInstallRoot)\include /DHAVE_CONFIG_H
/DG_DISABLE_SINGLE_INCLUDES /DATK_DISABLE_SINGLE_INCLUDES /DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES
/DGTK_DISABLE_SINGLE_INCLUDES /D_USE_MATH_DEFINES /DINCLUDE_IM_am_et /DINCLUDE_IM_cedilla
/DINCLUDE_IM_cyrillic_translit /DINCLUDE_IM_ime /DINCLUDE_IM_inuktitut /DINCLUDE_IM_ipa
/DINCLUDE_IM_multipress /DINCLUDE_IM_thai /DINCLUDE_IM_ti_er /DINCLUDE_IM_ti_et /DINCLUDE_IM_viqr
/DGTK_COMPILATION /DG_LOG_DOMAIN=\"Gtk\" /DGTK_HOST=\"i686-pc-vs$(VSVer)\"
/DGTK_PRINT_BACKENDS=\"file\" /DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED /D$(GtkIncludedImmodulesDefi
nes) /DG
TK_LIBDIR=\"$(GtkDummyPrefix)/lib\" /DGTK_DATADIR=\"$(GtkDummyPrefix)/share\"
/DGTK_DATA_PREFIX=\"$(GtkDummyPrefix)\" /DGTK_SYSCONFDIR=\"$(GtkDummyPrefix)/etc\"
/DMULTIPRESS_CONFDIR=\"$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\"
/DMULTIPRESS_LOCALEDIR=\"$(GtkDummyPrefix)/share/locale\" /DGTK_VERSION=\"$(GtkVersion)\"
/DGTK_BINARY_VERSION=\"$(GtkBinaryVersion)\" /DGDK_DISABLE_DEPRECATED /DISOLATION_AWARE_ENABLED
..\..\..\gtk\gtktypefuncs.preproc.c > ..\..\..\gtk\gtktypefuncs.combined.c

-$(PythonDirX64)\python ..\..\..\gtk\gentypefuncs.py ..\..\..\gtk\gtktypefuncs.inc
..\..\..\gtk\gtktypefuncs.combined.c

-del ..\..\..\gtk\gtktypefuncs.combined.c ..\..\..\gtk\gtktypefuncs.preproc.c

- "
+ Name="GeneratedDemoSources"
+ Value="..\..\..\demos\gtk-demo\demos.h"
/>
</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gtk3-prebuild.vcproj b/build/win32/vs9/gtk3-prebuild.vcproj
index 0946dfac88..7c328f7274 100644
--- a/build/win32/vs9/gtk3-prebuild.vcproj
+++ b/build/win32/vs9/gtk3-prebuild.vcproj
@@ -31,7 +31,7 @@
BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName)
$(IntrospectPythonParam)"
ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName)
$(IntrospectPythonParam) clean all"
CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName)
$(IntrospectPythonParam) clean"
- Output="$(GeneratedGdkSources);$(GeneratedDemoSources)"
+ Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
/>
</Configuration>
<Configuration
@@ -46,7 +46,7 @@
BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName)
$(IntrospectPythonParam)"
ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName)
$(IntrospectPythonParam) clean all"
CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName)
$(IntrospectPythonParam) clean"
- Output="$(GeneratedGdkSources);$(GeneratedDemoSources)"
+ Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
/>
</Configuration>
<Configuration
@@ -61,7 +61,7 @@
BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1
$(IntrospectPythonParam)"
ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1
$(IntrospectPythonParam) clean all"
CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1
$(IntrospectPythonParam) clean"
- Output="$(GeneratedGdkSources);$(GeneratedDemoSources)"
+ Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
/>
</Configuration>
<Configuration
@@ -76,7 +76,7 @@
BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1
$(IntrospectPythonParam)"
ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1
$(IntrospectPythonParam) clean all"
CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1
$(IntrospectPythonParam) clean"
- Output="$(GeneratedGdkSources);$(GeneratedDemoSources)"
+ Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
/>
</Configuration>
<Configuration
@@ -92,7 +92,7 @@
BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName)
$(IntrospectPythonParam)"
ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName)
$(IntrospectPythonParam) clean all"
CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName)
$(IntrospectPythonParam) clean"
- Output="$(GeneratedGdkSources);$(GeneratedDemoSources)"
+ Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
/>
</Configuration>
<Configuration
@@ -108,7 +108,7 @@
BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName)
$(IntrospectPythonParam)"
ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName)
$(IntrospectPythonParam) clean all"
CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName)
$(IntrospectPythonParam) clean"
- Output="$(GeneratedGdkSources);$(GeneratedDemoSources)"
+ Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
/>
</Configuration>
<Configuration
@@ -124,7 +124,7 @@
BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1
$(IntrospectPythonParam)"
ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1
$(IntrospectPythonParam) clean all"
CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1
$(IntrospectPythonParam) clean"
- Output="$(GeneratedGdkSources);$(GeneratedDemoSources)"
+ Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
/>
</Configuration>
<Configuration
@@ -140,7 +140,7 @@
BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1
$(IntrospectPythonParam)"
ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1
$(IntrospectPythonParam) clean all"
CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1
$(IntrospectPythonParam) clean"
- Output="$(GeneratedGdkSources);$(GeneratedDemoSources)"
+ Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
/>
</Configuration>
</Configurations>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
