diff options
| -rw-r--r-- | build/Makefile.am | 1 | ||||
| -rw-r--r-- | build/gtk-introspection-msvc.mak.in (renamed from build/gtk-introspection-msvc.mak) | 2 | ||||
| -rw-r--r-- | build/win32/vs10/Makefile.am | 1 | ||||
| -rw-r--r-- | build/win32/vs10/gtk-version-paths.props.in (renamed from build/win32/vs10/gtk-version-paths.props) | 4 | ||||
| -rw-r--r-- | build/win32/vs9/Makefile.am | 1 | ||||
| -rw-r--r-- | build/win32/vs9/gtk-version-paths.vsprops.in (renamed from build/win32/vs9/gtk-version-paths.vsprops) | 4 | ||||
| -rw-r--r-- | configure.ac | 3 |
7 files changed, 15 insertions, 1 deletions
diff --git a/build/Makefile.am b/build/Makefile.am index 931735b4fa..1e6b82587d 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -8,6 +8,7 @@ EXTRA_DIST += \ gen-file-list-gtk.py \ detectenv_msvc.mak \ introspection-msvc.mak \ + gtk-introspection-msvc.mak.in \ gtk-introspection-msvc.mak -include $(top_srcdir)/git.mk diff --git a/build/gtk-introspection-msvc.mak b/build/gtk-introspection-msvc.mak.in index fe1fa3fd66..97130232d3 100644 --- a/build/gtk-introspection-msvc.mak +++ b/build/gtk-introspection-msvc.mak.in @@ -74,7 +74,7 @@ Gtk-$(APIVERSION).gir: gtk_list --pkg-export gtk+-3.0 --warn-all --c-include="gtk/gtkx.h" \ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"/dummy/lib\" \ $(TIME_T_DEFINE) -DGTK_DATADIR=\"/dummy/share\" -DGTK_DATA_PREFIX=\"/dummy\" \ - -DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_VERSION=\"3.12.0\" \ + -DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_VERSION=\"@GTK_VERSION@\" \ -DGTK_BINARY_VERSION=\"3.0.0\" -DGTK_HOST=\"i686-pc-vs$(VSVER)\" \ -DGTK_COMPILATION -DGTK_PRINT_BACKENDS=\"file\" \ -DGTK_PRINT_PREVIEW_COMMAND=\"undefined-gtk-print-preview-command\" \ diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index ba9b0aab9c..74767fb43e 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -36,6 +36,7 @@ EXTRA_DIST += \ gtk-gen-srcs.props \ gtk-ignore-broadway.props \ gtk-install.props \ + gtk-version-paths.props.in \ gtk-version-paths.props -include $(top_srcdir)/git.mk diff --git a/build/win32/vs10/gtk-version-paths.props b/build/win32/vs10/gtk-version-paths.props.in index f23f373635..ea2a1dc3e5 100644 --- a/build/win32/vs10/gtk-version-paths.props +++ b/build/win32/vs10/gtk-version-paths.props.in @@ -5,6 +5,7 @@ <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>..\..\..\..\vs$(VSVer)\$(Platform)</CopyDir> <ApiVersion>3.0</ApiVersion> + <GtkVersion>@GTK_VERSION@</GtkVersion> <GtkLibtoolCompatibleDllPrefix>lib</GtkLibtoolCompatibleDllPrefix> <GtkLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</GtkLibtoolCompatibleDllSuffix> <GtkSeparateVSDllPrefix /> @@ -29,6 +30,9 @@ <BuildMacro Include="ApiVersion"> <Value>$(ApiVersion)</Value> </BuildMacro> + <BuildMacro Include="GtkVersion"> + <Value>$(GtkVersion)</Value> + </BuildMacro> <BuildMacro Include="GtkLibtoolCompatibleDllPrefix"> <Value>$(GtkLibtoolCompatibleDllPrefix)</Value> </BuildMacro> diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index f5d6f21f4e..18e3fe38dd 100644 --- a/build/win32/vs9/Makefile.am +++ b/build/win32/vs9/Makefile.am @@ -23,6 +23,7 @@ EXTRA_DIST += \ gtk-gen-srcs.vsprops \ gtk-ignore-broadway.vsprops \ gtk-install.vsprops \ + gtk-version-paths.vsprops.in \ gtk-version-paths.vsprops -include $(top_srcdir)/git.mk diff --git a/build/win32/vs9/gtk-version-paths.vsprops b/build/win32/vs9/gtk-version-paths.vsprops.in index c12a839c1f..7f2d1026c2 100644 --- a/build/win32/vs9/gtk-version-paths.vsprops +++ b/build/win32/vs9/gtk-version-paths.vsprops.in @@ -21,6 +21,10 @@ Value="3.0" /> <UserMacro + Name="GtkVersion" + Value="@GTK_VERSION@" + /> + <UserMacro Name="GtkLibtoolCompatibleDllPrefix" Value="lib" /> diff --git a/configure.ac b/configure.ac index 314dacf82b..a75130ef01 100644 --- a/configure.ac +++ b/configure.ac @@ -1875,10 +1875,13 @@ docs/reference/libgail-util/Makefile docs/reference/libgail-util/version.xml docs/tools/Makefile build/Makefile +build/gtk-introspection-msvc.mak build/win32/Makefile build/win32/crypt/Makefile build/win32/vs9/Makefile +build/win32/vs9/gtk-version-paths.vsprops build/win32/vs10/Makefile +build/win32/vs10/gtk-version-paths.props build/win32/vs11/Makefile build/win32/vs12/Makefile gdk/Makefile |