luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-07 16:38:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bug 688681: Stop using .def files in Visual Studio builds

Browse Source 
Since we are now starting to use __declspec (dllexport) to export the
public functions during the build of the GLib DLLs (i.e. to generate the
.lib files), we don't want to generate the .def files from the .symbols
files as we did before for a long time.

This removes from the projects the custom build steps to generate the
various .def files

This will also update the pre-configured config.h(.win32.in) to define
_GLIB_EXTERN appropriately as __declspec (dllexport), as well as making its
entries reflect config.h.in more closely.
This commit is contained in:
Chun-wei Fan
2013-01-15 15:23:05 +08:00
parent c4d8eafd00
commit 4ba56f3653
9 changed files with 16 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
build/win32/vs10/glib.vcxprojin
View File

@@ -150,7 +150,6 @@
<Link>
<AdditionalDependencies>ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)glib.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -176,7 +175,6 @@
<Link>
<AdditionalDependencies>ws2_32.lib;winmm.lib;pcred.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)glib.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -202,7 +200,6 @@
<Link>
<AdditionalDependencies>ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)glib.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -228,7 +225,6 @@
<Link>
<AdditionalDependencies>ws2_32.lib;winmm.lib;pcred.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)glib.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -251,7 +247,6 @@
<Link>
<AdditionalDependencies>ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)glib.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -276,7 +271,6 @@
<Link>
<AdditionalDependencies>ws2_32.lib;winmm.lib;pcre.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)glib.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -301,7 +295,6 @@
<Link>
<AdditionalDependencies>ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)glib.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -326,7 +319,6 @@
<Link>
<AdditionalDependencies>ws2_32.lib;winmm.lib;pcre.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)glib.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -533,34 +525,6 @@
<ItemGroup>
<ResourceCompile Include="..\..\..\glib\glib.rc" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\glib\glib.symbols">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">Generating glib.def</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">$(GlibGenerateGlibDef)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">$(IntDir)glib.def;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">Generating glib.def</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">$(GlibGenerateGlibDefW64)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|x64'">$(IntDir)glib.def;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating glib.def</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibGenerateGlibDef)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)glib.def;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating glib.def</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibGenerateGlibDefW64)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)glib.def;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">Generating glib.def</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">$(GlibGenerateGlibDef)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|Win32'">$(IntDir)glib.def;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">Generating glib.def</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">$(GlibGenerateGlibDefW64)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">$(IntDir)glib.def;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating glib.def</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibGenerateGlibDef)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)glib.def;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating glib.def</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibGenerateGlibDefW64)</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)glib.def;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>