[glib/glib-2-50] Visual Studio builds: Redo utility script generation
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/glib-2-50] Visual Studio builds: Redo utility script generation
- Date: Wed, 24 May 2017 08:01:43 +0000 (UTC)
commit 4baacdd80d26d41c242b2a65ea0db742a9363f2e
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Wed May 24 16:00:54 2017 +0800
Visual Studio builds: Redo utility script generation
Use the new gen_util_scripts.py script to generate the glib-mkenums and
gdbus-codegen scripts with the proper info in them so that they can be
used properly by other build systems such as Meson, during "install".
build/win32/vs10/glib-gen-srcs.props | 4 --
build/win32/vs10/glib-install.propsin | 14 +++++-
build/win32/vs10/glib-install.vcxproj | 42 +++++++++------
build/win32/vs10/glib-install.vcxproj.filters | 4 +-
build/win32/vs10/gobject.vcxproj.filtersin | 7 +--
build/win32/vs10/gobject.vcxprojin | 24 ++-------
build/win32/vs9/glib-gen-srcs.vsprops | 4 --
build/win32/vs9/glib-install.vcproj | 68 +++++++++++++++++++++++++
build/win32/vs9/glib-install.vspropsin | 8 +++
build/win32/vs9/gobject.vcprojin | 42 ++--------------
10 files changed, 126 insertions(+), 91 deletions(-)
---
diff --git a/build/win32/vs10/glib-gen-srcs.props b/build/win32/vs10/glib-gen-srcs.props
index 64a20ea..94309d8 100644
--- a/build/win32/vs10/glib-gen-srcs.props
+++ b/build/win32/vs10/glib-gen-srcs.props
@@ -8,7 +8,6 @@
<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=$(GlibVersion)</GenGLibMKEnums>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>glibgensrcsprops</_PropertySheetDisplayName>
@@ -26,8 +25,5 @@
<BuildMacro Include="GenGNetworkingH">
<Value>$(GenGNetworkingH)</Value>
</BuildMacro>
- <BuildMacro Include="GenGLibMKEnums">
- <Value>$(GenGLibMKEnums)</Value>
- </BuildMacro>
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/glib-install.propsin b/build/win32/vs10/glib-install.propsin
index e6b13a6..ce4d574 100644
--- a/build/win32/vs10/glib-install.propsin
+++ b/build/win32/vs10/glib-install.propsin
@@ -36,8 +36,8 @@ copy $(BinDir)\gdbus.exe $(CopyDir)\bin
copy $(BinDir)\gdbus.pdb $(CopyDir)\bin
copy $(BinDir)\gio.exe $(CopyDir)\bin
copy $(BinDir)\gio.pdb $(CopyDir)\bin
-copy ..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen
+if exist ..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen copy ..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen
$(CopyDir)\bin
if exist ..\..\..\gobject\glib-mkenums copy ..\..\..\gobject\glib-mkenums $(CopyDir)\bin
mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated
@@ -83,7 +83,10 @@ copy ..\..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas
mkdir $(CopyDir)\share\glib-$(ApiVersion)\codegen
copy ..\..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen
</GlibDoInstall>
+
<GlibUtilScripts>..\..\..\gobject\glib-mkenums;..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen</GlibUtilScripts>
<GlibPCFiles>..\gio-windows-2.0.pc;..\gio-2.0.pc;..\gobject-2.0.pc;..\gmodule-no-export-2.0.pc;..\gmodule-export-2.0.pc;..\gmodule-2.0.pc;..\gthread-2.0.pc;..\glib-2.0.pc</GlibPCFiles>
+ <GenGLibMKEnums>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py
--type=glib-mkenums --version=$(GlibVersion)</GenGLibMKEnums>
+ <GenGDBusCodegen>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py
--type=gdbus-codegen --version=$(GlibVersion)</GenGDBusCodegen>
<GlibGenPC>(if not exist $(CopyDir) mkdir $(CopyDir)) & (if exist $(PythonPath)\python.exe
$(PythonPath)\python.exe ..\glibpc.py --prefix=$(CopyDir) --version=$(GlibVersion))</GlibGenPC>
</PropertyGroup>
<PropertyGroup>
@@ -96,9 +99,18 @@ copy ..\..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\cod
<BuildMacro Include="GlibDoInstall">
<Value>$(GlibDoInstall)</Value>
</BuildMacro>
+ <BuildMacro Include="GlibUtilScripts">
+ <Value>$(GlibUtilScripts)</Value>
+ </BuildMacro>
<BuildMacro Include="GlibPCFiles">
<Value>$(GlibPCFiles)</Value>
</BuildMacro>
+ <BuildMacro Include="GenGLibMKEnums">
+ <Value>$(GenGLibMKEnums)</Value>
+ </BuildMacro>
+ <BuildMacro Include="GenGDBusCodegen">
+ <Value>$(GenGDBusCodegen)</Value>
+ </BuildMacro>
<BuildMacro Include="GlibGenPC">
<Value>$(GlibGenPC)</Value>
</BuildMacro>
diff --git a/build/win32/vs10/glib-install.vcxproj b/build/win32/vs10/glib-install.vcxproj
index faa4404..810b712 100644
--- a/build/win32/vs10/glib-install.vcxproj
+++ b/build/win32/vs10/glib-install.vcxproj
@@ -99,23 +99,31 @@
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibGenPC)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibPCFiles);%(Outputs)</Outputs>
</CustomBuild>
- <CustomBuild Include="..\..\..\config.h.win32">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing Build
Results...</Message>
- <AdditionalInputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibPCFiles)</AdditionalInputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibDoInstall)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">blah;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing Build Results...</Message>
- <AdditionalInputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibPCFiles)</AdditionalInputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibDoInstall)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">blah;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing Build
Results...</Message>
- <AdditionalInputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibPCFiles)</AdditionalInputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibDoInstall)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">blah;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing Build
Results...</Message>
- <AdditionalInputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibPCFiles)</AdditionalInputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibDoInstall)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">blah;%(Outputs)</Outputs>
+ <CustomBuild Include="..\..\..\gobject\glib-mkenums.in">
+ <Message Condition="'$(Configuration)'=='Debug'">Generating glib-mkenums...</Message>
+ <Command Condition="'$(Configuration)'=='Debug'">$(GenGLibMKEnums)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug'">..\..\..\gobject\glib-mkenums;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Generating glib-mkenums...</Message>
+ <Command Condition="'$(Configuration)'=='Release'">$(GenGLibMKEnums)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release'">..\..\..\gobject\glib-mkenums;%(Outputs)</Outputs>
+ </CustomBuild>
+ <CustomBuild Include="..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in">
+ <Message Condition="'$(Configuration)'=='Debug'">Generating gdbus-codegen...</Message>
+ <Command Condition="'$(Configuration)'=='Debug'">$(GenGDBusCodegen)</Command>
+ <Outputs
Condition="'$(Configuration)'=='Debug'">..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Generating gdbus-codegen...</Message>
+ <Command Condition="'$(Configuration)'=='Release'">$(GenGDBusCodegen)</Command>
+ <Outputs
Condition="'$(Configuration)'=='Release'">..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen;%(Outputs)</Outputs>
+ </CustomBuild>
+ <CustomBuild Include="glib_install_placeholder">
+ <Message Condition="'$(Configuration)'=='Debug'">Installing Build Results...</Message>
+ <AdditionalInputs
Condition="'$(Configuration)'=='Debug'">$(GlibPCFiles);$(GlibUtilScripts)</AdditionalInputs>
+ <Command Condition="'$(Configuration)'=='Debug'">$(GlibDoInstall)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug'">blah;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Installing Build Results...</Message>
+ <AdditionalInputs
Condition="'$(Configuration)'=='Release'">$(GlibPCFiles);$(GlibUtilScripts)</AdditionalInputs>
+ <Command Condition="'$(Configuration)'=='Release'">$(GlibDoInstall)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release'">blah;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>
diff --git a/build/win32/vs10/glib-install.vcxproj.filters b/build/win32/vs10/glib-install.vcxproj.filters
index 18ffe5f..a317b0b 100644
--- a/build/win32/vs10/glib-install.vcxproj.filters
+++ b/build/win32/vs10/glib-install.vcxproj.filters
@@ -7,7 +7,9 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\..\gobject\glib-mkenums.in"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in"><Filter>Resource
Files</Filter></CustomBuild>
+ <CustomBuild Include="glib_install_placeholder"><Filter>Resource Files</Filter></CustomBuild>
<CustomBuild Include="..\glibpc.py"><Filter>Resource Files</Filter></CustomBuild>
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/gobject.vcxproj.filtersin b/build/win32/vs10/gobject.vcxproj.filtersin
index 3174802..5f3a057 100644
--- a/build/win32/vs10/gobject.vcxproj.filtersin
+++ b/build/win32/vs10/gobject.vcxproj.filtersin
@@ -18,11 +18,6 @@
#include "gobject.vs10.sourcefiles.filters"
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\gobject\glib-mkenums.in"><Filter>Resource Files</Filter></CustomBuild>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="..\..\..\gobject\gobject.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
+ <ResourceCompile Include="..\..\..\gobject\gobject.rc"><Filter>Resource Files</Filter></ResourceCompile>
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/gobject.vcxprojin b/build/win32/vs10/gobject.vcxprojin
index b08bd5b..4229296 100644
--- a/build/win32/vs10/gobject.vcxprojin
+++ b/build/win32/vs10/gobject.vcxprojin
@@ -51,19 +51,19 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="glib-gen-srcs.props" />
+ <Import Project="glib-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="glib-gen-srcs.props" />
+ <Import Project="glib-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="glib-gen-srcs.props" />
+ <Import Project="glib-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="glib-gen-srcs.props" />
+ <Import Project="glib-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -174,22 +174,6 @@
#include "gobject.vs10.sourcefiles"
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\gobject\glib-mkenums.in">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating glib-mkenums...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenGLibMKEnums)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gobject\glib-mkenums;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating glib-mkenums...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenGLibMKEnums)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gobject\glib-mkenums;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating
glib-mkenums...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenGLibMKEnums)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gobject\glib-mkenums;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating glib-mkenums...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenGLibMKEnums)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gobject\glib-mkenums;%(Outputs)</Outputs>
- </CustomBuild>
- </ItemGroup>
- <ItemGroup>
<ResourceCompile Include="..\..\..\gobject\gobject.rc" />
</ItemGroup>
<ItemGroup>
diff --git a/build/win32/vs9/glib-gen-srcs.vsprops b/build/win32/vs9/glib-gen-srcs.vsprops
index a4cf9f8..7b5af3b 100644
--- a/build/win32/vs9/glib-gen-srcs.vsprops
+++ b/build/win32/vs9/glib-gen-srcs.vsprops
@@ -21,8 +21,4 @@
Name="GenGNetworkingH"
Value="copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h"
/>
- <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=$(GlibVersion)"
- />
</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/glib-install.vcproj b/build/win32/vs9/glib-install.vcproj
index 7324f0f..e2ce127 100644
--- a/build/win32/vs9/glib-install.vcproj
+++ b/build/win32/vs9/glib-install.vcproj
@@ -114,6 +114,74 @@
/>
</FileConfiguration>
</File>
+ <File RelativePath="..\..\..\gobject\glib-mkenums.in">
+ <FileConfiguration Name="Debug|Win32">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating glib-mkenums..."
+ CommandLine="$(GenGLibMKEnums)"
+ Outputs="..\..\..\gobject\glib-mkenums"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release|Win32">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating glib-mkenums..."
+ CommandLine="$(GenGLibMKEnums)"
+ Outputs="..\..\..\gobject\glib-mkenums"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Debug|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating glib-mkenums..."
+ CommandLine="$(GenGLibMKEnums)"
+ Outputs="..\..\..\gobject\glib-mkenums"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating glib-mkenums..."
+ CommandLine="$(GenGLibMKEnums)"
+ Outputs="..\..\..\gobject\glib-mkenums"
+ />
+ </FileConfiguration>
+ </File>
+ <File RelativePath="..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in">
+ <FileConfiguration Name="Debug|Win32">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating gdbus-codegen..."
+ CommandLine="$(GenGDBusCodegen)"
+ Outputs="..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release|Win32">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating gdbus-codegen..."
+ CommandLine="$(GenGDBusCodegen)"
+ Outputs="..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Debug|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating gdbus-codegen..."
+ CommandLine="$(GenGDBusCodegen)"
+ Outputs="..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating gdbus-codegen..."
+ CommandLine="$(GenGDBusCodegen)"
+ Outputs="..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen"
+ />
+ </FileConfiguration>
+ </File>
</Filter>
</Files>
</VisualStudioProject>
diff --git a/build/win32/vs9/glib-install.vspropsin b/build/win32/vs9/glib-install.vspropsin
index a511ebb..8b2617a 100644
--- a/build/win32/vs9/glib-install.vspropsin
+++ b/build/win32/vs9/glib-install.vspropsin
@@ -86,6 +86,14 @@ copy ..\..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\cod
"
/>
<UserMacro
+ Name="GenGLibMKEnums"
+ Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py
--type=glib-mkenums --version=$(GlibVersion)"
+ />
+ <UserMacro
+ Name="GenGDBusCodegen"
+ Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py
--type=gdbus-codegen --version=$(GlibVersion)"
+ />
+ <UserMacro
Name="GlibGenPC"
Value="(if not exist $(CopyDir) mkdir $(CopyDir)) & (if exist $(PythonPath)\python.exe
$(PythonPath)\python.exe ..\glibpc.py --prefix=$(CopyDir) --version=$(GlibVersion))"
/>
diff --git a/build/win32/vs9/gobject.vcprojin b/build/win32/vs9/gobject.vcprojin
index 82609cc..9478461 100644
--- a/build/win32/vs9/gobject.vcprojin
+++ b/build/win32/vs9/gobject.vcprojin
@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\glib-gen-srcs.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -51,7 +51,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\glib-gen-srcs.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -81,7 +81,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\glib-gen-srcs.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -111,7 +111,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\glib-gen-srcs.vsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -161,40 +161,6 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
- <File RelativePath="..\..\..\gobject\glib-mkenums.in">
- <FileConfiguration Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating glib-mkenums..."
- CommandLine="$(GenGLibMKEnums)"
- Outputs="..\..\..\gobject\glib-mkenums"
- />
- </FileConfiguration>
- <FileConfiguration Name="Release|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating glib-mkenums..."
- CommandLine="$(GenGLibMKEnums)"
- Outputs="..\..\..\gobject\glib-mkenums"
- />
- </FileConfiguration>
- <FileConfiguration Name="Debug|x64">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating glib-mkenums..."
- CommandLine="$(GenGLibMKEnums)"
- Outputs="..\..\..\gobject\glib-mkenums"
- />
- </FileConfiguration>
- <FileConfiguration Name="Release|x64">
- <Tool
- Name="VCCustomBuildTool"
- Description="Generating glib-mkenums..."
- CommandLine="$(GenGLibMKEnums)"
- Outputs="..\..\..\gobject\glib-mkenums"
- />
- </FileConfiguration>
- </File>
<File RelativePath="..\..\..\gobject\gobject.rc" />
</Filter>
</Files>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
