luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-23 18:52:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Visual Studio builds: Include pcre_version.c in build

Browse Source 
... for builds using the PCRE bundled with the GLib sources, so that
pcre_version() will also be defined, and be exported so that the regex test program
will properly link when the bundled PCRE sources are used.

This is a follow-up commit to 476f30a.
This commit is contained in:
Chun-wei Fan 2016-01-19 13:03:41 +08:00 committed by Iain Lane
parent 062a71bf9f
commit fd6a80eba4
5 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/win32/vs10/glib-build-defines.props
View File

@ -5,6 +5,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"> <PropertyGroup Label="UserMacros">
<GLibBundledPCREDefines>PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000;SUPPORT_UCP;SUPPORT_UTF;SUPPORT_UTF8;G_LOG_DOMAIN="GLib-GRegex"</GLibBundledPCREDefines> <GLibBundledPCREDefines>PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000;SUPPORT_UCP;SUPPORT_UTF;SUPPORT_UTF8;G_LOG_DOMAIN="GLib-GRegex"</GLibBundledPCREDefines>
<GlibBundledPCREExportDefines>PCRE_EXP_DECL=__declspec(dllexport)extern;PCRE_EXP_DEFN=</GlibBundledPCREExportDefines>
<GLibBundledPCREUndefs>-UBSR_ANYCRLF -UEBCDIC</GLibBundledPCREUndefs> <GLibBundledPCREUndefs>-UBSR_ANYCRLF -UEBCDIC</GLibBundledPCREUndefs>
<LocalCharsetDefs>LIBDIR="blah"</LocalCharsetDefs> <LocalCharsetDefs>LIBDIR="blah"</LocalCharsetDefs>
<DllExportDefines>DLL_EXPORT</DllExportDefines> <DllExportDefines>DLL_EXPORT</DllExportDefines>
@ -40,6 +41,9 @@
<BuildMacro Include="GLibBundledPCREDefines"> <BuildMacro Include="GLibBundledPCREDefines">
<Value>$(GLibBundledPCREDefines)</Value> <Value>$(GLibBundledPCREDefines)</Value>
</BuildMacro> </BuildMacro>
<BuildMacro Include="GlibBundledPCREExportDefines">
<Value>$(GlibBundledPCREExportDefines)</Value>
</BuildMacro>
<BuildMacro Include="GLibBundledPCREUndefs"> <BuildMacro Include="GLibBundledPCREUndefs">
<Value>$(GLibBundledPCREUndefs)</Value> <Value>$(GLibBundledPCREUndefs)</Value>
</BuildMacro> </BuildMacro>
@ -77,4 +81,4 @@
<Value>$(WindowsNetworkingLibs)</Value> <Value>$(WindowsNetworkingLibs)</Value>
</BuildMacro> </BuildMacro>
</ItemGroup> </ItemGroup>
</Project> </Project>

3
build/win32/vs10/glib.vcxproj.filtersin
View File

@ -103,6 +103,9 @@
<ClCompile Include="..\..\..\glib\pcre\pcre_valid_utf8.c"> <ClCompile Include="..\..\..\glib\pcre\pcre_valid_utf8.c">
<Filter>Source Files\pcre</Filter> <Filter>Source Files\pcre</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\glib\pcre\pcre_version.c">
<Filter>Source Files\pcre</Filter>
</ClCompile>
<ClCompile Include="..\..\..\glib\pcre\pcre_xclass.c"> <ClCompile Include="..\..\..\glib\pcre\pcre_xclass.c">
<Filter>Source Files\pcre</Filter> <Filter>Source Files\pcre</Filter>
</ClCompile> </ClCompile>

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

@ -587,6 +587,20 @@
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_ExtPCRE|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\glib\pcre\pcre_version.c">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\glib\pcre\pcre_xclass.c"> <ClCompile Include="..\..\..\glib\pcre\pcre_xclass.c">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GLibBundledPCREUndefs) %(AdditionalOptions)</AdditionalOptions>

4
build/win32/vs9/glib-build-defines.vsprops
View File

@ -23,6 +23,10 @@
Name="GLibBundledPCREDefines" Name="GLibBundledPCREDefines"
Value="PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000;SUPPORT_UCP;SUPPORT_UTF;SUPPORT_UTF8;G_LOG_DOMAIN=\&quot;GLib-GRegex\&quot;" Value="PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000;SUPPORT_UCP;SUPPORT_UTF;SUPPORT_UTF8;G_LOG_DOMAIN=\&quot;GLib-GRegex\&quot;"
/> />
<UserMacro
Name="GlibBundledPCREExportDefines"
Value="PCRE_EXP_DECL=__declspec(dllexport)extern;PCRE_EXP_DEFN="
/>
<UserMacro <UserMacro
Name="GLibBundledPCREUndefs" Name="GLibBundledPCREUndefs"
Value="-UBSR_ANYCRLF -UEBCDIC" Value="-UBSR_ANYCRLF -UEBCDIC"

10
build/win32/vs9/glib.vcprojin
View File

@ -471,6 +471,16 @@
<FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Release_ExtPCRE|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release_ExtPCRE|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
</File> </File>
<File RelativePath="..\..\..\glib\pcre\pcre_version.c" >
<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Debug_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Release_BundledPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines);$(GlibBundledPCREExportDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
</File>
<File RelativePath="..\..\..\glib\pcre\pcre_xclass.c" > <File RelativePath="..\..\..\glib\pcre\pcre_xclass.c" >
<FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration> <FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)" AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Debug_ExtPCRE|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Debug_ExtPCRE|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>