[gobject-introspection/gnome-3-16] MSVC Builds: Clean Up And Fix the Projects
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection/gnome-3-16] MSVC Builds: Clean Up And Fix the Projects
- Date: Fri, 24 Jul 2015 05:36:48 +0000 (UTC)
commit ffd2bd9b20a32f414d5fcf91984e9c10a681c3b0
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Jul 24 13:34:04 2015 +0800
MSVC Builds: Clean Up And Fix the Projects
We use the __declspec(dllexport) mechanism for exporting the symbols from
the girepository DLL during the build since some time ago, but forgot to
remove the .def-generating items from the project files, notably the MSVC
2010+ ones, which could have well broke those builds. Sorry.
build/win32/vs10/gi-gen-srcs.props | 7 -------
build/win32/vs10/girepository.vcxprojin | 12 ------------
build/win32/vs9/gi-gen-srcs.vsprops | 7 -------
3 files changed, 0 insertions(+), 26 deletions(-)
---
diff --git a/build/win32/vs10/gi-gen-srcs.props b/build/win32/vs10/gi-gen-srcs.props
index 0cda3d5..5d1ae79 100644
--- a/build/win32/vs10/gi-gen-srcs.props
+++ b/build/win32/vs10/gi-gen-srcs.props
@@ -8,10 +8,6 @@
<CopyGIRScanner>copy ..\..\..\tools\g-ir-scanner.in ..\..\..\tools\g-ir-scanner</CopyGIRScanner>
<CopyGIRDocTool>copy ..\..\..\tools\g-ir-doc-tool.in ..\..\..\tools\g-ir-doc-tool</CopyGIRDocTool>
<CopyGIRAnnotationTool>copy ..\..\..\tools\g-ir-annotation-tool.in
..\..\..\tools\g-ir-annotation-tool</CopyGIRAnnotationTool>
- <GenerateGIRDef>
-echo EXPORTS > $(DefDir)\girepository.def
-cl -EP ..\..\..\girepository\girepository.symbols >> $(DefDir)\girepository.def
- </GenerateGIRDef>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>gigensrcsprops</_PropertySheetDisplayName>
@@ -29,8 +25,5 @@ cl -EP ..\..\..\girepository\girepository.symbols >> $(DefDir)\girepositor
<BuildMacro Include="CopyGIRAnnotationTool">
<Value>$(CopyGIRAnnotationTool)</Value>
</BuildMacro>
- <BuildMacro Include="GenerateGIRDef">
- <Value>$(GenerateGIRDef)</Value>
- </BuildMacro>
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/girepository.vcxprojin b/build/win32/vs10/girepository.vcxprojin
index 393f675..3da5007 100644
--- a/build/win32/vs10/girepository.vcxprojin
+++ b/build/win32/vs10/girepository.vcxprojin
@@ -85,9 +85,6 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateGIRDef)</Command>
- </PreLinkEvent>
<Link>
<AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
@@ -111,9 +108,6 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateGIRDef)</Command>
- </PreLinkEvent>
<Link>
<AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
@@ -142,9 +136,6 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateGIRDef)</Command>
- </PreLinkEvent>
<Link>
<AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
@@ -171,9 +162,6 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateGIRDef)</Command>
- </PreLinkEvent>
<Link>
<AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
diff --git a/build/win32/vs9/gi-gen-srcs.vsprops b/build/win32/vs9/gi-gen-srcs.vsprops
index 82c7f68..d2d5ddb 100644
--- a/build/win32/vs9/gi-gen-srcs.vsprops
+++ b/build/win32/vs9/gi-gen-srcs.vsprops
@@ -29,11 +29,4 @@ copy ..\..\..\tools\g-ir-doc-tool.in ..\..\..\tools\g-ir-doc-tool
copy ..\..\..\tools\g-ir-annotation-tool.in ..\..\..\tools\g-ir-annotation-tool
"
/>
- <UserMacro
- Name="GenerateGIRDef"
- Value="
-echo EXPORTS > $(DefDir)\girepository.def

-cl -EP ..\..\..\girepository\girepository.symbols >> $(DefDir)\girepository.def

- "
- />
</VisualStudioPropertySheet>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]