mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-08-01 15:03:39 +02:00
VS support updates
-Fix GLib project/filter files generation as some source items are under the "deprecated" subfolder, and filter out the gthread-*.c -Explicitly specify gthread-win32.c in the GLib project/filter file templates, since tarballs are done on Linux. -Don't define g_static_mutex_get_mutex in the pregenerated glibconfig.h.win32(.in) as it is defined in deprecated/gthread.h for Windows
This commit is contained in:
@@ -31,6 +31,9 @@
|
||||
<ClCompile Include="..\..\..\glib\gspawn-win32.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\glib\gthread-win32.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\glib\gwin32.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
|
@@ -334,6 +334,7 @@
|
||||
#include "libglib.vs10.sourcefiles"
|
||||
<ClCompile Include="..\..\..\glib\giowin32.c" />
|
||||
<ClCompile Include="..\..\..\glib\gspawn-win32.c" />
|
||||
<ClCompile Include="..\..\..\glib\gthread-win32.c" />
|
||||
<ClCompile Include="..\..\..\glib\gwin32.c" />
|
||||
<ClCompile Include="..\..\..\glib\libcharset\localcharset.c">
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">LIBDIR=/irrelevant/lib;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
|
@@ -291,77 +291,20 @@
|
||||
#include "libglib.sourcefiles"
|
||||
<File RelativePath="..\..\..\glib\giowin32.c" />
|
||||
<File RelativePath="..\..\..\glib\gspawn-win32.c" />
|
||||
<File RelativePath="..\..\..\glib\gthread-win32.c" />
|
||||
<File RelativePath="..\..\..\glib\gwin32.c" />
|
||||
<Filter
|
||||
Name="libcharset"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\..\glib\libcharset\localcharset.c"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
PreprocessorDefinitions="LIBDIR="/irrelevant/lib""
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug_ExtPCRE|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
PreprocessorDefinitions="LIBDIR="/irrelevant/lib""
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug|x64"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
PreprocessorDefinitions="LIBDIR="/irrelevant/lib""
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug_ExtPCRE|x64"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
PreprocessorDefinitions="LIBDIR="/irrelevant/lib""
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
PreprocessorDefinitions="LIBDIR="/irrelevant/lib""
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release_ExtPCRE|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
PreprocessorDefinitions="LIBDIR="/irrelevant/lib""
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|x64"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
PreprocessorDefinitions="LIBDIR="/irrelevant/lib""
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release_ExtPCRE|x64"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
PreprocessorDefinitions="LIBDIR="/irrelevant/lib""
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<File RelativePath="..\..\..\glib\libcharset\localcharset.c">
|
||||
<FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="LIBDIR="/irrelevant/lib""/></FileConfiguration>
|
||||
<FileConfiguration Name="Debug_ExtPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="LIBDIR="/irrelevant/lib""/></FileConfiguration>
|
||||
<FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="LIBDIR="/irrelevant/lib""/></FileConfiguration>
|
||||
<FileConfiguration Name="Debug_ExtPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="LIBDIR="/irrelevant/lib""/></FileConfiguration>
|
||||
<FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="LIBDIR="/irrelevant/lib""/></FileConfiguration>
|
||||
<FileConfiguration Name="Release_ExtPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="LIBDIR="/irrelevant/lib""/></FileConfiguration>
|
||||
<FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="LIBDIR="/irrelevant/lib""/></FileConfiguration>
|
||||
<FileConfiguration Name="Release_ExtPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="LIBDIR="/irrelevant/lib""/></FileConfiguration>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
|
Reference in New Issue
Block a user