diff options
| -rw-r--r-- | build/win32/vs10/girepository.vcxproj.filtersin | 5 | ||||
| -rw-r--r-- | build/win32/vs10/girepository.vcxprojin | 30 | ||||
| -rw-r--r-- | build/win32/vs9/girepository.vcprojin | 46 |
3 files changed, 10 insertions, 71 deletions
diff --git a/build/win32/vs10/girepository.vcxproj.filtersin b/build/win32/vs10/girepository.vcxproj.filtersin index c0245dc0..8e9255d7 100644 --- a/build/win32/vs10/girepository.vcxproj.filtersin +++ b/build/win32/vs10/girepository.vcxproj.filtersin @@ -17,7 +17,4 @@ <ItemGroup> #include "girepository.vs10.sourcefiles.filters" </ItemGroup> - <ItemGroup> - <CustomBuild Include="..\..\..\girepository\girepository.symbols"><Filter>Resource Files</Filter></CustomBuild> - </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs10/girepository.vcxprojin b/build/win32/vs10/girepository.vcxprojin index 76702e94..fd2d414e 100644 --- a/build/win32/vs10/girepository.vcxprojin +++ b/build/win32/vs10/girepository.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="gi-gen-srcs.props" /> + <Import Project="gi-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="gi-gen-srcs.props" /> + <Import Project="gi-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="gi-gen-srcs.props" /> + <Import Project="gi-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="gi-gen-srcs.props" /> + <Import Project="gi-build-defines.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> @@ -91,7 +91,6 @@ <Link> <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile> - <ModuleDefinitionFile>$(IntDir)girepository.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> @@ -117,7 +116,6 @@ <Link> <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile> - <ModuleDefinitionFile>$(IntDir)girepository.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> @@ -148,7 +146,6 @@ <Link> <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile> - <ModuleDefinitionFile>$(IntDir)girepository.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary> @@ -177,7 +174,6 @@ <Link> <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile> - <ModuleDefinitionFile>$(IntDir)girepository.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> @@ -190,22 +186,6 @@ #include "girepository.vs10.sourcefiles" </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\..\girepository\girepository.symbols"> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating $(DefDir)\girepository.def...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateGIRDef)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(DefDir)\girepository.def;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating $(DefDir)\girepository.def...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateGIRDef)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(DefDir)\girepository.def;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating $(DefDir)\girepository.def...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateGIRDef)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(DefDir)\girepository.def;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating $(DefDir)\girepository.def...</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateGIRDef)</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(DefDir)\girepository.def;%(Outputs)</Outputs> - </CustomBuild> - </ItemGroup> - <ItemGroup> <ProjectReference Include="gi-prebuild.vcxproj"> <Project>{2093d218-190e-4194-9421-3ba7cbf33b11}</Project> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> @@ -218,4 +198,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs9/girepository.vcprojin b/build/win32/vs9/girepository.vcprojin index 37f7377a..b7d4063f 100644 --- a/build/win32/vs9/girepository.vcprojin +++ b/build/win32/vs9/girepository.vcprojin @@ -22,7 +22,7 @@ <Configuration Name="Debug|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gi-gen-srcs.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool @@ -42,7 +42,6 @@ AdditionalDependencies="libffi.lib" OutputFile="$(OutDir)\$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll" LinkIncremental="2" - ModuleDefinitionFile="$(IntDir)\girepository.def" GenerateDebugInformation="true" SubSystem="2" ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" @@ -52,7 +51,7 @@ <Configuration Name="Release|Win32" ConfigurationType="2" - InheritedPropertySheets=".\gi-gen-srcs.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > @@ -73,7 +72,6 @@ AdditionalDependencies="libffi.lib" OutputFile="$(OutDir)\$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll" LinkIncremental="1" - ModuleDefinitionFile="$(IntDir)\girepository.def" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" @@ -85,7 +83,7 @@ <Configuration Name="Debug|x64" ConfigurationType="2" - InheritedPropertySheets=".\gi-gen-srcs.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" > <Tool @@ -109,7 +107,6 @@ AdditionalDependencies="libffi.lib" OutputFile="$(OutDir)\$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll" LinkIncremental="2" - ModuleDefinitionFile="$(IntDir)\girepository.def" GenerateDebugInformation="true" SubSystem="2" ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" @@ -119,7 +116,7 @@ <Configuration Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\gi-gen-srcs.vsprops" + InheritedPropertySheets=".\gi-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > @@ -144,7 +141,6 @@ AdditionalDependencies="libffi.lib" OutputFile="$(OutDir)\$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll" LinkIncremental="1" - ModuleDefinitionFile="$(IntDir)\girepository.def" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" @@ -175,40 +171,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="..\..\..\girepository\girepository.symbols"> - <FileConfiguration Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating $(DefDir)\girepository.def..." - CommandLine="$(GenerateGIRDef)" - Outputs="$(DefDir)\girepository.def" - /> - </FileConfiguration> - <FileConfiguration Name="Release|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating $(DefDir)\girepository.def..." - CommandLine="$(GenerateGIRDef)" - Outputs="$(DefDir)\girepository.def" - /> - </FileConfiguration> - <FileConfiguration Name="Debug|x64"> - <Tool - Name="VCCustomBuildTool" - Description="Generating $(DefDir)\girepository.def..." - CommandLine="$(GenerateGIRDef)" - Outputs="$(DefDir)\girepository.def" - /> - </FileConfiguration> - <FileConfiguration Name="Release|x64"> - <Tool - Name="VCCustomBuildTool" - Description="Generating $(DefDir)\girepository.def..." - CommandLine="$(GenerateGIRDef)" - Outputs="$(DefDir)\girepository.def" - /> - </FileConfiguration> - </File> </Filter> </Files> <Globals> |