diff options
author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-07-24 13:34:04 +0800 |
---|---|---|
committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-07-24 13:36:55 +0800 |
commit | ffd2bd9b20a32f414d5fcf91984e9c10a681c3b0 (patch) | |
tree | 9bc9f6a536b0ea70b513a31757d313e330740ee7 /build/win32/vs10 | |
parent | ccca91aaabfc0d6a555c4b14893420f03a6bfa8e (diff) | |
download | gobject-introspection-ffd2bd9b20a32f414d5fcf91984e9c10a681c3b0.tar.gz |
MSVC Builds: Clean Up And Fix the Projectsgnome-3-16
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.
Diffstat (limited to 'build/win32/vs10')
-rw-r--r-- | build/win32/vs10/gi-gen-srcs.props | 7 | ||||
-rw-r--r-- | build/win32/vs10/girepository.vcxprojin | 12 |
2 files changed, 0 insertions, 19 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 > $(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 393f6754..3da50079 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> |