[glib] Visual Studio builds: Include pcre_version.c in build
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Visual Studio builds: Include pcre_version.c in build
- Date: Wed, 20 Jan 2016 09:20:53 +0000 (UTC)
commit 57f9c590f94bd74d1b3b72656fd1cc1c76000980
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Tue Jan 19 13:03:41 2016 +0800
Visual Studio builds: Include pcre_version.c in build
... 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.
build/win32/vs10/glib-build-defines.props | 6 +++++-
build/win32/vs10/glib.vcxproj.filtersin | 3 +++
build/win32/vs10/glib.vcxprojin | 14 ++++++++++++++
build/win32/vs9/glib-build-defines.vsprops | 4 ++++
build/win32/vs9/glib.vcprojin | 10 ++++++++++
5 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/build/win32/vs10/glib-build-defines.props b/build/win32/vs10/glib-build-defines.props
index 229ea8c..9634e5b 100644
--- a/build/win32/vs10/glib-build-defines.props
+++ b/build/win32/vs10/glib-build-defines.props
@@ -5,6 +5,7 @@
</ImportGroup>
<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>
+
<GlibBundledPCREExportDefines>PCRE_EXP_DECL=__declspec(dllexport)extern;PCRE_EXP_DEFN=</GlibBundledPCREExportDefines>
<GLibBundledPCREUndefs>-UBSR_ANYCRLF -UEBCDIC</GLibBundledPCREUndefs>
<LocalCharsetDefs>LIBDIR="blah"</LocalCharsetDefs>
<DllExportDefines>DLL_EXPORT</DllExportDefines>
@@ -40,6 +41,9 @@
<BuildMacro Include="GLibBundledPCREDefines">
<Value>$(GLibBundledPCREDefines)</Value>
</BuildMacro>
+ <BuildMacro Include="GlibBundledPCREExportDefines">
+ <Value>$(GlibBundledPCREExportDefines)</Value>
+ </BuildMacro>
<BuildMacro Include="GLibBundledPCREUndefs">
<Value>$(GLibBundledPCREUndefs)</Value>
</BuildMacro>
@@ -77,4 +81,4 @@
<Value>$(WindowsNetworkingLibs)</Value>
</BuildMacro>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/glib.vcxproj.filtersin b/build/win32/vs10/glib.vcxproj.filtersin
index e5bcdc0..853efb6 100644
--- a/build/win32/vs10/glib.vcxproj.filtersin
+++ b/build/win32/vs10/glib.vcxproj.filtersin
@@ -103,6 +103,9 @@
<ClCompile Include="..\..\..\glib\pcre\pcre_valid_utf8.c">
<Filter>Source Files\pcre</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\glib\pcre\pcre_version.c">
+ <Filter>Source Files\pcre</Filter>
+ </ClCompile>
<ClCompile Include="..\..\..\glib\pcre\pcre_xclass.c">
<Filter>Source Files\pcre</Filter>
</ClCompile>
diff --git a/build/win32/vs10/glib.vcxprojin b/build/win32/vs10/glib.vcxprojin
index 36e7d7a..a7a9372 100644
--- a/build/win32/vs10/glib.vcxprojin
+++ b/build/win32/vs10/glib.vcxprojin
@@ -583,6 +583,20 @@
<AdditionalOptions
Condition="'$(Configuration)|$(Platform)'=='Release_BundledPCRE|x64'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</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">
<PreprocessorDefinitions
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions
Condition="'$(Configuration)|$(Platform)'=='Debug_BundledPCRE|Win32'">$(GLibBundledPCREUndefs)
%(AdditionalOptions)</AdditionalOptions>
diff --git a/build/win32/vs9/glib-build-defines.vsprops b/build/win32/vs9/glib-build-defines.vsprops
index 0140dfd..cc36536 100644
--- a/build/win32/vs9/glib-build-defines.vsprops
+++ b/build/win32/vs9/glib-build-defines.vsprops
@@ -24,6 +24,10 @@
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=\"GLib-GRegex\""
/>
<UserMacro
+ Name="GlibBundledPCREExportDefines"
+ Value="PCRE_EXP_DECL=__declspec(dllexport)extern;PCRE_EXP_DEFN="
+ />
+ <UserMacro
Name="GLibBundledPCREUndefs"
Value="-UBSR_ANYCRLF -UEBCDIC"
/>
diff --git a/build/win32/vs9/glib.vcprojin b/build/win32/vs9/glib.vcprojin
index 00c2284..86e72e1 100644
--- a/build/win32/vs9/glib.vcprojin
+++ b/build/win32/vs9/glib.vcprojin
@@ -471,6 +471,16 @@
<FileConfiguration Name="Release_BundledPCRE|x64"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
</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" >
<FileConfiguration Name="Debug_BundledPCRE|Win32"><Tool
Name="VCCLCompilerTool" PreprocessorDefinitions="$(GLibBundledPCREDefines)"
AdditionalOptions="$(GLibBundledPCREUndefs)" /></FileConfiguration>
<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool
Name="VCCLCompilerTool" /></FileConfiguration>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]