summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2015-07-24 13:34:04 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2015-07-24 13:37:22 +0800
commit173241052f56ac2ce756032e4e15d1b45804dce9 (patch)
tree439316ddcc6e0bdca9d3ec1620c8825807474a37
parentfe050239852eb0754b8ac603d8cd9eb06c60c867 (diff)
downloadgobject-introspection-gnome-3-14.tar.gz
MSVC Builds: Clean Up And Fix the Projectsgnome-3-14
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.
-rw-r--r--build/win32/vs10/gi-gen-srcs.props7
-rw-r--r--build/win32/vs10/girepository.vcxprojin12
-rw-r--r--build/win32/vs9/gi-gen-srcs.vsprops7
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 0cda3d54..5d1ae79d 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 &gt; $(DefDir)\girepository.def
-cl -EP ..\..\..\girepository\girepository.symbols &gt;&gt; $(DefDir)\girepository.def
- </GenerateGIRDef>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>gigensrcsprops</_PropertySheetDisplayName>
@@ -29,8 +25,5 @@ cl -EP ..\..\..\girepository\girepository.symbols &gt;&gt; $(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 fd2d414e..deaf4711 100644
--- a/build/win32/vs10/girepository.vcxprojin
+++ b/build/win32/vs10/girepository.vcxprojin
@@ -85,9 +85,6 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateGIRDef)</Command>
- </PreLinkEvent>
<Link>
<AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
@@ -110,9 +107,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>
@@ -140,9 +134,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>
@@ -168,9 +159,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 82c7f68c..d2d5ddbb 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 &gt; $(DefDir)\girepository.def&#x0D;&#x0A;
-cl -EP ..\..\..\girepository\girepository.symbols &gt;&gt; $(DefDir)\girepository.def&#x0D;&#x0A;
- "
- />
</VisualStudioPropertySheet>