Commit 99b30f38 authored by Chun-wei Fan's avatar Chun-wei Fan

Visual Studio builds: Move @GLIB_VERSION@ usage

... from glib-gen-srcs.[vsprops|props].in to
glib-version-paths.[vsprops|props].in, and instead let autotools generate
glib-version-paths.[vsprops|props] rather than
glib-gen-srcs.[vsprops|props], as this will need to be referenced for
other items as well, namely generating the .pc files which will become
useful for introspection builds.
parent 73192b84
......@@ -8,5 +8,5 @@ glib-compile-resources.vcxproj
glib-compile-resources.vcxproj.filters
glib-compile-schemas.vcxproj
glib-compile-schemas.vcxproj.filters
glib-gen-srcs.props
glib-version-paths.props
glib-install.props
......@@ -9,7 +9,7 @@ GENERATED_ITEMS = \
glib-compile-schemas.vcxproj.filters \
glib-compile-resources.vcxproj \
glib-compile-resources.vcxproj.filters \
glib-gen-srcs.props \
glib-version-paths.props \
glib-install.props
MSVC10_HEADERS_LIST = glib.vs10.headers gobject.vs10.headers gio.vs10.headers
......@@ -46,10 +46,10 @@ EXTRA_DIST = \
gdbus.vcxproj \
gdbus.vcxproj.filters \
glib-install.vcxproj \
glib-build-defines.props \
glib-build-defines.props \
glib-install.propsin \
glib-version-paths.props \
glib-gen-srcs.props.in \
glib-version-paths.props.in \
glib-gen-srcs.props \
$(GENERATED_ITEMS)
glib-install.props: $(top_srcdir)/build/win32/vs10/glib-install.propsin $(MSVC10_HEADERS_LIST)
......
......@@ -8,7 +8,7 @@
<GenGLibConfigH>copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h</GenGLibConfigH>
<GenGModuleConfH>copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h</GenGModuleConfH>
<GenGNetworkingH>copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h</GenGNetworkingH>
<GenGLibMKEnums>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\gobject\glib-mkenums.in --output=..\..\..\gobject\glib-mkenums --var=GLIB_VERSION --outstring=@GLIB_VERSION@</GenGLibMKEnums>
<GenGLibMKEnums>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\gobject\glib-mkenums.in --output=..\..\..\gobject\glib-mkenums --var=GLIB_VERSION --outstring=$(GlibVersion)</GenGLibMKEnums>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>glibgensrcsprops</_PropertySheetDisplayName>
......
......@@ -2,9 +2,10 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
<VSVer>10</VSVer>
<GlibVersion>@GLIB_VERSION@</GlibVersion>
<ApiVersion>2.0</ApiVersion>
<GlibEtcInstallRoot>..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
<ApiVersion>2.0</ApiVersion>
<GlibLibtoolCompatibleDllPrefix>lib</GlibLibtoolCompatibleDllPrefix>
<GlibLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</GlibLibtoolCompatibleDllSuffix>
<GlibSeparateVSDllPrefix />
......@@ -20,15 +21,18 @@
<BuildMacro Include="VSVer">
<Value>$(VSVer)</Value>
</BuildMacro>
<BuildMacro Include="GlibVersion">
<Value>$(GlibVersion)</Value>
</BuildMacro>
<BuildMacro Include="ApiVersion">
<Value>$(ApiVersion)</Value>
</BuildMacro>
<BuildMacro Include="GlibEtcInstallRoot">
<Value>$(GlibEtcInstallRoot)</Value>
</BuildMacro>
<BuildMacro Include="CopyDir">
<Value>$(CopyDir)</Value>
</BuildMacro>
<BuildMacro Include="ApiVersion">
<Value>$(ApiVersion)</Value>
</BuildMacro>
<BuildMacro Include="GlibLibtoolCompatibleDllPrefix">
<Value>$(GlibLibtoolCompatibleDllPrefix)</Value>
</BuildMacro>
......
......@@ -3,5 +3,5 @@ gobject.vcproj
gio.vcproj
glib-compile-resources.vcproj
glib-compile-schemas.vcproj
glib-gen-srcs.vsprops
glib-version-paths.vsprops
glib-install.vsprops
......@@ -4,7 +4,7 @@ GENERATED_ITEMS = \
gio.vcproj \
glib-compile-schemas.vcproj \
glib-compile-resources.vcproj \
glib-gen-srcs.vsprops \
glib-version-paths.vsprops \
glib-install.vsprops
MSVC_HEADERS_LIST = glib.headers gobject.headers gio.headers
......@@ -28,8 +28,8 @@ EXTRA_DIST = \
glib-compile-resources.vcprojin \
glib-install.vcproj \
glib-build-defines.vsprops \
glib-version-paths.vsprops \
glib-gen-srcs.vsprops.in \
glib-version-paths.vsprops.in \
glib-gen-srcs.vsprops \
glib-install.vspropsin \
$(GENERATED_ITEMS)
......
......@@ -23,6 +23,6 @@
/>
<UserMacro
Name="GenGLibMKEnums"
Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\gobject\glib-mkenums.in --output=..\..\..\gobject\glib-mkenums --var=GLIB_VERSION --outstring=@GLIB_VERSION@"
Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\gobject\glib-mkenums.in --output=..\..\..\gobject\glib-mkenums --var=GLIB_VERSION --outstring=$(GlibVersion)"
/>
</VisualStudioPropertySheet>
......@@ -8,6 +8,14 @@
Name="VSVer"
Value="9"
/>
<UserMacro
Name="GlibVersion"
Value="@GLIB_VERSION@"
/>
<UserMacro
Name="ApiVersion"
Value="2.0"
/>
<UserMacro
Name="GlibEtcInstallRoot"
Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
......@@ -16,10 +24,6 @@
Name="CopyDir"
Value="$(GlibEtcInstallRoot)"
/>
<UserMacro
Name="ApiVersion"
Value="2.0"
/>
<UserMacro
Name="GlibLibtoolCompatibleDllPrefix"
Value="lib"
......
......@@ -3386,9 +3386,9 @@ build/Makefile
build/win32/Makefile
build/win32/dirent/Makefile
build/win32/vs9/Makefile
build/win32/vs9/glib-gen-srcs.vsprops
build/win32/vs9/glib-version-paths.vsprops
build/win32/vs10/Makefile
build/win32/vs10/glib-gen-srcs.props
build/win32/vs10/glib-version-paths.props
build/win32/vs11/Makefile
build/win32/vs12/Makefile
build/win32/vs14/Makefile
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment