[gtk/gtk-3-24] Visual Studio projects: Fix generating gtktypefuncs.inc
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/gtk-3-24] Visual Studio projects: Fix generating gtktypefuncs.inc
- Date: Tue, 18 Jun 2019 06:38:46 +0000 (UTC)
commit 0b509158780647b1b9f61709fe33f4f45ee4869a
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Tue Jun 18 14:30:50 2019 +0800
Visual Studio projects: Fix generating gtktypefuncs.inc
From the Meson port, gtk/gtktesteutils.c now includes
gtk/gtktypefuncs.in instead of gtk/gtktypefuncs.c, so we should do the
same thing in the Visual Studio projects, to fix the build.
Also, since build/win32/gentypefuncs.py is an adaptation of the script
from GTK master (in gtk/), and that we now have gtk/gentypefuncs.py, we
should use the version of the script in gtk/ and drop the one in
build/win32.
build/win32/Makefile.am | 1 -
build/win32/gentypefuncs.py | 53 --------------------------------
build/win32/vs10/gtk-3.vcxproj.filtersin | 2 +-
build/win32/vs10/gtk-3.vcxprojin | 6 ++--
build/win32/vs10/gtk3-gen-srcs.props | 2 +-
build/win32/vs9/gtk-3.vcprojin | 18 +++++------
build/win32/vs9/gtk3-gen-srcs.vsprops | 4 +--
7 files changed, 16 insertions(+), 70 deletions(-)
---
diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
index e47c8c411e..fe2cbb2204 100644
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -36,7 +36,6 @@ SUBDIRS = \
EXTRA_DIST += \
detectenv-msvc.mak \
- gentypefuncs.py \
gtk-introspection-msvc.mak \
introspection-msvc.mak \
replace.py \
diff --git a/build/win32/vs10/gtk-3.vcxproj.filtersin b/build/win32/vs10/gtk-3.vcxproj.filtersin
index 71f72d8b65..b672d9b476 100644
--- a/build/win32/vs10/gtk-3.vcxproj.filtersin
+++ b/build/win32/vs10/gtk-3.vcxproj.filtersin
@@ -21,7 +21,7 @@
<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="..\gentypefuncs.py"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\..\gtk\gentypefuncs.py"><Filter>Resource Files</Filter></CustomBuild>
</ItemGroup>
<ItemGroup>
#include "gtk-3.vs10.sourcefiles.filters"
diff --git a/build/win32/vs10/gtk-3.vcxprojin b/build/win32/vs10/gtk-3.vcxprojin
index dc4fbb82a6..c5629ccbd2 100644
--- a/build/win32/vs10/gtk-3.vcxprojin
+++ b/build/win32/vs10/gtk-3.vcxprojin
@@ -178,10 +178,10 @@
<Command>$(GenerateGtkWin32Manifest)</Command>
<Outputs>..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
</CustomBuild>
- <CustomBuild Include="..\gentypefuncs.py">
- <Message>Generating ..\..\..\gtk\gtktypefuncs.c</Message>
+ <CustomBuild Include="..\..\..\gtk\gentypefuncs.py">
+ <Message>Generating ..\..\..\gtk\gtktypefuncs.inc</Message>
<Command>$(GenerateTypeFuncs)</Command>
- <Outputs>..\..\..\gtk\gtktypefuncs.c</Outputs>
+ <Outputs>..\..\..\gtk\gtktypefuncs.inc</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>
diff --git a/build/win32/vs10/gtk3-gen-srcs.props b/build/win32/vs10/gtk3-gen-srcs.props
index 3e6eeb5e65..0865564f77 100644
--- a/build/win32/vs10/gtk3-gen-srcs.props
+++ b/build/win32/vs10/gtk3-gen-srcs.props
@@ -47,7 +47,7 @@ echo $(Configuration) > ..\..\..\MSVC_$(Configuration)_Broadway
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$(GtkIncludedImmodulesDefines) /DGTK_LIBDIR=\"$(GtkDummy
Prefix)/
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 ..\gentypefuncs.py ..\..\..\gtk\gtktypefuncs.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
</GenerateTypeFuncs>
</PropertyGroup>
diff --git a/build/win32/vs9/gtk-3.vcprojin b/build/win32/vs9/gtk-3.vcprojin
index 5ca9df4791..55218a7573 100644
--- a/build/win32/vs9/gtk-3.vcprojin
+++ b/build/win32/vs9/gtk-3.vcprojin
@@ -252,33 +252,33 @@
/>
</FileConfiguration>
</File>
- <File RelativePath="..\gentypefuncs.py">
+ <File RelativePath="..\..\..\gtk\gentypefuncs.py">
<FileConfiguration Name="Debug|Win32">
<Tool Name="VCCustomBuildTool"
- Description="Generating ..\..\..\gtk\gtktypefuncs.c..."
+ Description="Generating ..\..\..\gtk\gtktypefuncs.inc..."
CommandLine="$(GenerateTypeFuncs)"
- Outputs="..\..\..\gtk\gtktypefuncs.c"
+ Outputs="..\..\..\gtk\gtktypefuncs.inc"
/>
</FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool Name="VCCustomBuildTool"
- Description="Generating ..\..\..\gtk\gtktypefuncs.c..."
+ Description="Generating ..\..\..\gtk\gtktypefuncs.inc..."
CommandLine="$(GenerateTypeFuncs)"
- Outputs="..\..\..\gtk\gtktypefuncs.c"
+ Outputs="..\..\..\gtk\gtktypefuncs.inc"
/>
</FileConfiguration>
<FileConfiguration Name="Debug|x64">
<Tool Name="VCCustomBuildTool"
- Description="Generating ..\..\..\gtk\gtktypefuncs.c..."
+ Description="Generating ..\..\..\gtk\gtktypefuncs.inc..."
CommandLine="$(GenerateTypeFuncsX64)"
- Outputs="..\..\..\gtk\gtktypefuncs.c"
+ Outputs="..\..\..\gtk\gtktypefuncs.inc"
/>
</FileConfiguration>
<FileConfiguration Name="Release|x64">
<Tool Name="VCCustomBuildTool"
- Description="Generating ..\..\..\gtk\gtktypefuncs.c..."
+ Description="Generating ..\..\..\gtk\gtktypefuncs.inc..."
CommandLine="$(GenerateTypeFuncsX64)"
- Outputs="..\..\..\gtk\gtktypefuncs.c"
+ Outputs="..\..\..\gtk\gtktypefuncs.inc"
/>
</FileConfiguration>
</File>
diff --git a/build/win32/vs9/gtk3-gen-srcs.vsprops b/build/win32/vs9/gtk3-gen-srcs.vsprops
index 19909550e5..b74bf9a71f 100644
--- a/build/win32/vs9/gtk3-gen-srcs.vsprops
+++ b/build/win32/vs9/gtk3-gen-srcs.vsprops
@@ -84,7 +84,7 @@ echo $(ConfigurationName) > ..\..\..\MSVC_$(ConfigurationName)_Broadway
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 ..\gentypefuncs.py ..\..\..\gtk\gtktypefuncs.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

"
/>
@@ -94,7 +94,7 @@ del ..\..\..\gtk\gtktypefuncs.combined.c ..\..\..\gtk\gtktypefuncs.preproc.c�
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 ..\gentypefuncs.py ..\..\..\gtk\gtktypefuncs.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

"
/>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
