diff --git a/build/win32/vs10/gio.vcxprojin b/build/win32/vs10/gio.vcxprojin index e4ad35552..52f6d1a92 100644 --- a/build/win32/vs10/gio.vcxprojin +++ b/build/win32/vs10/gio.vcxprojin @@ -88,7 +88,6 @@ zlib1d.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)gio.def true Windows false @@ -112,7 +111,6 @@ zlib1.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)gio.def true Windows true @@ -141,7 +139,6 @@ zlib1d.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)gio.def true Windows false @@ -165,7 +162,6 @@ zlib1.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)gio.def true Windows true @@ -183,22 +179,6 @@ - - - Generating gio.def - $(GlibGenerateGioDef) - $(IntDir)gio.def;%(Outputs) - Generating gio.def - $(GlibGenerateGioDef) - $(IntDir)gio.def;%(Outputs) - Generating gio.def - $(GlibGenerateGioDef) - $(IntDir)gio.def;%(Outputs) - Generating gio.def - $(GlibGenerateGioDef) - $(IntDir)gio.def;%(Outputs) - - {12bca020-eabf-429e-876a-a476bc9c10c0} diff --git a/build/win32/vs10/glib.vcxprojin b/build/win32/vs10/glib.vcxprojin index 371eb1882..ebb4a9a33 100644 --- a/build/win32/vs10/glib.vcxprojin +++ b/build/win32/vs10/glib.vcxprojin @@ -150,7 +150,6 @@ ws2_32.lib;winmm.lib;%(AdditionalDependencies) $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)glib.def true Windows false @@ -176,7 +175,6 @@ ws2_32.lib;winmm.lib;pcred.lib;%(AdditionalDependencies) $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)glib.def true Windows false @@ -202,7 +200,6 @@ ws2_32.lib;winmm.lib;%(AdditionalDependencies) $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)glib.def true Windows false @@ -228,7 +225,6 @@ ws2_32.lib;winmm.lib;pcred.lib;%(AdditionalDependencies) $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)glib.def true Windows false @@ -251,7 +247,6 @@ ws2_32.lib;winmm.lib;%(AdditionalDependencies) $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)glib.def true Windows true @@ -276,7 +271,6 @@ ws2_32.lib;winmm.lib;pcre.lib;%(AdditionalDependencies) $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)glib.def true Windows true @@ -301,7 +295,6 @@ ws2_32.lib;winmm.lib;%(AdditionalDependencies) $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)glib.def true Windows true @@ -326,7 +319,6 @@ ws2_32.lib;winmm.lib;pcre.lib;%(AdditionalDependencies) $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)glib.def true Windows true @@ -533,34 +525,6 @@ - - - Generating glib.def - $(GlibGenerateGlibDef) - $(IntDir)glib.def;%(Outputs) - Generating glib.def - $(GlibGenerateGlibDefW64) - $(IntDir)glib.def;%(Outputs) - Generating glib.def - $(GlibGenerateGlibDef) - $(IntDir)glib.def;%(Outputs) - Generating glib.def - $(GlibGenerateGlibDefW64) - $(IntDir)glib.def;%(Outputs) - Generating glib.def - $(GlibGenerateGlibDef) - $(IntDir)glib.def;%(Outputs) - Generating glib.def - $(GlibGenerateGlibDefW64) - $(IntDir)glib.def;%(Outputs) - Generating glib.def - $(GlibGenerateGlibDef) - $(IntDir)glib.def;%(Outputs) - Generating glib.def - $(GlibGenerateGlibDefW64) - $(IntDir)glib.def;%(Outputs) - - diff --git a/build/win32/vs10/gmodule.vcxproj b/build/win32/vs10/gmodule.vcxproj index 6c103490b..dd9e60220 100644 --- a/build/win32/vs10/gmodule.vcxproj +++ b/build/win32/vs10/gmodule.vcxproj @@ -87,7 +87,6 @@ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)gmodule.def true Windows false @@ -109,7 +108,6 @@ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)gmodule.def true Windows true @@ -136,7 +134,6 @@ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)gmodule.def true Windows false @@ -158,7 +155,6 @@ $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)gmodule.def true Windows true @@ -176,22 +172,6 @@ - - - Generating gmodule.def - $(GlibGenerateGmoduleDef) - $(IntDir)gmodule.def;%(Outputs) - Generating gmodule.def - $(GlibGenerateGmoduleDefW64) - $(IntDir)gmodule.def;%(Outputs) - Generating gmodule.def - $(GlibGenerateGmoduleDef) - $(IntDir)gmodule.def;%(Outputs) - Generating gmodule.def - $(GlibGenerateGmoduleDefW64) - $(IntDir)gmodule.def;%(Outputs) - - {12bca020-eabf-429e-876a-a476bc9c10c0} diff --git a/build/win32/vs10/gobject.vcxprojin b/build/win32/vs10/gobject.vcxprojin index c80b9ba9b..171b3b7cd 100644 --- a/build/win32/vs10/gobject.vcxprojin +++ b/build/win32/vs10/gobject.vcxprojin @@ -87,7 +87,6 @@ libffi.lib;%(AdditionalDependencies) $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)gobject.def true Windows false @@ -110,7 +109,6 @@ libffi.lib;%(AdditionalDependencies) $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)gobject.def true Windows true @@ -139,7 +137,6 @@ libffi.lib;%(AdditionalDependencies) $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)gobject.def true Windows false @@ -162,7 +159,6 @@ libffi.lib;%(AdditionalDependencies) $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll - $(IntDir)gobject.def true Windows true @@ -182,22 +178,6 @@ - - - Generating gobject.def - $(GlibGenerateGobjectDef) - $(IntDir)gobject.def;%(Outputs) - Generating gobject.def - $(GlibGenerateGobjectDef) - $(IntDir)gobject.def;%(Outputs) - Generating gobject.def - $(GlibGenerateGobjectDef) - $(IntDir)gobject.def;%(Outputs) - Generating gobject.def - $(GlibGenerateGobjectDef) - $(IntDir)gobject.def;%(Outputs) - - {12bca020-eabf-429e-876a-a476bc9c10c0} diff --git a/build/win32/vs9/gio.vcprojin b/build/win32/vs9/gio.vcprojin index 8d73dcdef..bba97047a 100644 --- a/build/win32/vs9/gio.vcprojin +++ b/build/win32/vs9/gio.vcprojin @@ -42,7 +42,6 @@ AdditionalDependencies="zlib1d.lib ws2_32.lib shlwapi.lib dnsapi.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="2" - ModuleDefinitionFile="$(IntDir)\gio.def" GenerateDebugInformation="true" SubSystem="2" RandomizedBaseAddress="1" @@ -73,7 +72,6 @@ AdditionalDependencies="zlib1.lib ws2_32.lib shlwapi.lib dnsapi.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="1" - ModuleDefinitionFile="$(IntDir)\gio.def" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" @@ -108,7 +106,6 @@ AdditionalDependencies="zlib1d.lib ws2_32.lib shlwapi.lib dnsapi.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="2" - ModuleDefinitionFile="$(IntDir)\gio.def" GenerateDebugInformation="true" SubSystem="2" RandomizedBaseAddress="1" @@ -139,7 +136,6 @@ AdditionalDependencies="zlib1.lib ws2_32.lib shlwapi.lib dnsapi.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="1" - ModuleDefinitionFile="$(IntDir)\gio.def" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" @@ -172,54 +168,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > - - - - - - - - - - - - - - - - + diff --git a/build/win32/vs9/glib.vcprojin b/build/win32/vs9/glib.vcprojin index 6d1631ef2..6865eacc9 100644 --- a/build/win32/vs9/glib.vcprojin +++ b/build/win32/vs9/glib.vcprojin @@ -42,7 +42,6 @@ AdditionalDependencies="ws2_32.lib winmm.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="2" - ModuleDefinitionFile="$(IntDir)\glib.def" GenerateDebugInformation="true" SubSystem="2" RandomizedBaseAddress="1" @@ -75,7 +74,6 @@ AdditionalDependencies="ws2_32.lib winmm.lib pcred.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="2" - ModuleDefinitionFile="$(IntDir)\glib.def" GenerateDebugInformation="true" SubSystem="2" RandomizedBaseAddress="1" @@ -107,7 +105,6 @@ AdditionalDependencies="ws2_32.lib winmm.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="2" - ModuleDefinitionFile="$(IntDir)\glib.def" GenerateDebugInformation="true" SubSystem="2" RandomizedBaseAddress="1" @@ -140,7 +137,6 @@ AdditionalDependencies="ws2_32.lib winmm.lib pcred.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="2" - ModuleDefinitionFile="$(IntDir)\glib.def" GenerateDebugInformation="true" SubSystem="2" RandomizedBaseAddress="1" @@ -170,7 +166,6 @@ AdditionalDependencies="ws2_32.lib winmm.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="1" - ModuleDefinitionFile="$(IntDir)\glib.def" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" @@ -203,7 +198,6 @@ AdditionalDependencies="ws2_32.lib winmm.lib pcre.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="1" - ModuleDefinitionFile="$(IntDir)\glib.def" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" @@ -235,7 +229,6 @@ AdditionalDependencies="ws2_32.lib winmm.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="1" - ModuleDefinitionFile="$(IntDir)\glib.def" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" @@ -268,7 +261,6 @@ AdditionalDependencies="ws2_32.lib winmm.lib pcre.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="1" - ModuleDefinitionFile="$(IntDir)\glib.def" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" @@ -502,94 +494,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/build/win32/vs9/gmodule.vcproj b/build/win32/vs9/gmodule.vcproj index 773d91261..b4a133185 100644 --- a/build/win32/vs9/gmodule.vcproj +++ b/build/win32/vs9/gmodule.vcproj @@ -41,7 +41,6 @@ Name="VCLinkerTool" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="2" - ModuleDefinitionFile="$(IntDir)\gmodule.def" GenerateDebugInformation="true" SubSystem="2" RandomizedBaseAddress="1" @@ -70,7 +69,6 @@ Name="VCLinkerTool" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="1" - ModuleDefinitionFile="$(IntDir)\gmodule.def" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" @@ -103,7 +101,6 @@ Name="VCLinkerTool" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="2" - ModuleDefinitionFile="$(IntDir)\gmodule.def" GenerateDebugInformation="true" SubSystem="2" RandomizedBaseAddress="1" @@ -132,7 +129,6 @@ Name="VCLinkerTool" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="1" - ModuleDefinitionFile="$(IntDir)\gmodule.def" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" @@ -168,54 +164,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > - - - - - - - - - - - - - - - - + diff --git a/build/win32/vs9/gobject.vcprojin b/build/win32/vs9/gobject.vcprojin index c9baac31b..f8300e9b9 100644 --- a/build/win32/vs9/gobject.vcprojin +++ b/build/win32/vs9/gobject.vcprojin @@ -41,7 +41,6 @@ AdditionalDependencies="libffi.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="2" - ModuleDefinitionFile="$(IntDir)\gobject.def" GenerateDebugInformation="true" SubSystem="2" RandomizedBaseAddress="1" @@ -71,7 +70,6 @@ AdditionalDependencies="libffi.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="1" - ModuleDefinitionFile="$(IntDir)\gobject.def" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" @@ -105,7 +103,6 @@ AdditionalDependencies="libffi.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="2" - ModuleDefinitionFile="$(IntDir)\gobject.def" GenerateDebugInformation="true" SubSystem="2" RandomizedBaseAddress="1" @@ -135,7 +132,6 @@ AdditionalDependencies="libffi.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="1" - ModuleDefinitionFile="$(IntDir)\gobject.def" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" @@ -169,54 +165,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > - - - - - - - - - - - - - - - - + diff --git a/config.h.win32.in b/config.h.win32.in index 5550b5022..7a577ff96 100644 --- a/config.h.win32.in +++ b/config.h.win32.in @@ -89,9 +89,6 @@ */ /* #undef HAVE_ALLOCA_H */ -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ARPA_NAMESER_COMPAT_H */ - /* Define to 1 if you have the `atexit' function. */ #define HAVE_ATEXIT 1 @@ -363,9 +360,6 @@ /* Define to 1 if you have the header file, and it defines `DIR'. */ /* #undef HAVE_NDIR_H */ -/* Define to 1 if you have the header file. */ -/* #undef HAVE_NETDB_H */ - /* We have AF_NETLINK sockets */ /* #undef HAVE_NETLINK */ @@ -581,10 +575,16 @@ /* Define to 1 if you have the `symlink' function. */ /* #undef HAVE_SYMLINK */ +/* Define to 1 if you have the `sysctlbyname' function. */ +/* #undef HAVE_SYSCTLBYNAME */ + /* Define to 1 if you have the header file, and it defines `DIR'. */ /* #undef HAVE_SYS_DIR_H */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_EVENT_H */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_EVENT_H */ @@ -594,6 +594,9 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_INOTIFY_H */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_IOCTL_H */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_MKDEV_H */ @@ -736,13 +739,6 @@ /* Have a working bcopy */ /* #undef HAVE_WORKING_BCOPY */ -/* Define to 1 if you have the header file. */ -#ifndef _MSC_VER -/* #undef HAVE_WSPIAPI_H */ -#else -#define HAVE_WSPIAPI_H 1 -#endif - /* Define to 1 if xattr is available */ /* #undef HAVE_XATTR */ @@ -879,6 +875,9 @@ /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ +/* defines how to decorate public symbols while building */ +#define _GLIB_EXTERN __declspec (dllexport) + /* Make all glibc extensions visible */ /* #undef _GNU_SOURCE */