Bug 688681: Stop using the .def file for GThread Visual C++ builds

We should also stop using gthread/gthread.def file as well, since we
also use __declspec (dllexport) for the two (deprecated) functions there
since commit f8756694.

This should also silence some linker warnings in x64 builds.

Also get rid of the references to the .symbols files in the
.vcxproj.filters(in) in the various Visual C++ 2010 projects

diff --git a/build/win32/vs10/gio.vcxproj.filtersin b/build/win32/vs10/gio.vcxproj.filtersin
index 5b4e135..02a7ccf 100644 (file)
--- a/build/win32/vs10/gio.vcxproj.filtersin
+++ b/build/win32/vs10/gio.vcxproj.filtersin
@@ -22,9 +22,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\gio\gio.symbols">
-      <Filter>Resource Files</Filter>
-    </CustomBuild>
-  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/build/win32/vs10/glib.vcxproj.filtersin b/build/win32/vs10/glib.vcxproj.filtersin
index d809d88..8262d2f 100644 (file)
--- a/build/win32/vs10/glib.vcxproj.filtersin
+++ b/build/win32/vs10/glib.vcxproj.filtersin
@@ -112,9 +112,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\glib\glib.symbols">
-      <Filter>Resource Files</Filter>
-    </CustomBuild>
-  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/build/win32/vs10/gmodule.vcxproj.filters b/build/win32/vs10/gmodule.vcxproj.filters
index 30a6ee5..ceab446 100644 (file)
--- a/build/win32/vs10/gmodule.vcxproj.filters
+++ b/build/win32/vs10/gmodule.vcxproj.filters
@@ -24,9 +24,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\gmodule\gmodule.symbols">
-      <Filter>Resource Files</Filter>
-    </CustomBuild>
-  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/build/win32/vs10/gobject.vcxproj.filtersin b/build/win32/vs10/gobject.vcxproj.filtersin
index fcbfb32..17db3ef 100644 (file)
--- a/build/win32/vs10/gobject.vcxproj.filtersin
+++ b/build/win32/vs10/gobject.vcxproj.filtersin
@@ -22,9 +22,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\gobject\gobject.symbols">
-      <Filter>Resource Files</Filter>
-    </CustomBuild>
-  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/build/win32/vs10/gthread.vcxproj b/build/win32/vs10/gthread.vcxproj
index 2364fd3..e28e9db 100644 (file)
--- a/build/win32/vs10/gthread.vcxproj
+++ b/build/win32/vs10/gthread.vcxproj
@@ -87,7 +87,6 @@
     </ClCompile>\r
     <Link>\r
       <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>\r
-      <ModuleDefinitionFile>../../../gthread/gthread.def</ModuleDefinitionFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
@@ -109,7 +108,6 @@
     </ClCompile>\r
     <Link>\r
       <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>\r
-      <ModuleDefinitionFile>../../../gthread/gthread.def</ModuleDefinitionFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
@@ -136,7 +134,6 @@
     </ClCompile>\r
     <Link>\r
       <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>\r
-      <ModuleDefinitionFile>../../../gthread/gthread.def</ModuleDefinitionFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
@@ -158,7 +155,6 @@
     </ClCompile>\r
     <Link>\r
       <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile>\r
-      <ModuleDefinitionFile>../../../gthread/gthread.def</ModuleDefinitionFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
@@ -174,9 +170,6 @@
     <ClCompile Include="..\..\..\gthread\gthread-impl.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <None Include="..\..\..\gthread\gthread.def" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
     <ResourceCompile Include="..\..\..\gthread\gthread.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r

diff --git a/build/win32/vs10/gthread.vcxproj.filters b/build/win32/vs10/gthread.vcxproj.filters
index 23dbbb3..fb35c1f 100644 (file)
--- a/build/win32/vs10/gthread.vcxproj.filters
+++ b/build/win32/vs10/gthread.vcxproj.filters
@@ -20,11 +20,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\gthread\gthread.def">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
     <ResourceCompile Include="..\..\..\gthread\gthread.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>

diff --git a/build/win32/vs9/gthread.vcproj b/build/win32/vs9/gthread.vcproj
index cf695e2..7a6c1d9 100644 (file)
--- a/build/win32/vs9/gthread.vcproj
+++ b/build/win32/vs9/gthread.vcproj
@@ -41,7 +41,6 @@
                                Name="VCLinkerTool"\r
                                OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"\r
                                LinkIncremental="2"\r
-                               ModuleDefinitionFile="../../../gthread/gthread.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                RandomizedBaseAddress="1"\r
@@ -70,7 +69,6 @@
                                Name="VCLinkerTool"\r
                                OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"\r
                                LinkIncremental="1"\r
-                               ModuleDefinitionFile="../../../gthread/gthread.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
@@ -103,7 +101,6 @@
                                Name="VCLinkerTool"\r
                                OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"\r
                                LinkIncremental="2"\r
-                               ModuleDefinitionFile="../../../gthread/gthread.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                RandomizedBaseAddress="1"\r
@@ -132,7 +129,6 @@
                                Name="VCLinkerTool"\r
                                OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll"\r
                                LinkIncremental="1"\r
-                               ModuleDefinitionFile="../../../gthread/gthread.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
@@ -152,10 +148,7 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
-                       <File\r
-                               RelativePath="..\..\..\gthread\gthread-impl.c"\r
-                               >\r
-                       </File>\r
+                       <File RelativePath="..\..\..\gthread\gthread-impl.c" />\r
                </Filter>\r
                <Filter\r
                        Name="Header Files"\r
@@ -168,14 +161,7 @@
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
-                       <File\r
-                               RelativePath="..\..\..\gthread\gthread.def"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\..\gthread\gthread.rc"\r
-                               >\r
-                       </File>\r
+                       <File RelativePath="..\..\..\gthread\gthread.rc" />\r
                </Filter>\r
        </Files>\r
 </VisualStudioProject>\r