Put the PANGO_MODULE_PREFIX defines in the project files

Put the PANGO_MODULE_PREFIX defines in the project files instead of
having them behind an ifdef in the source files.

diff --git a/build/win32/vs9/pango.vcprojin b/build/win32/vs9/pango.vcprojin
index a68229e..ad7db04 100644 (file)
--- a/build/win32/vs9/pango.vcprojin
+++ b/build/win32/vs9/pango.vcprojin
@@ -152,8 +152,58 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\..\..\modules\arabic\arabic-lang.c" />
-                       <File RelativePath="..\..\..\modules\indic\indic-lang.c" />
+                       <File RelativePath="..\..\..\modules\arabic\arabic-lang.c">
+                               <FileConfiguration Name="Debug|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_lang"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Debug|x64">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_lang"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_lang"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|x64">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_lang"
+                                       />
+                               </FileConfiguration>
+                       </File>
+                       <File RelativePath="..\..\..\modules\indic\indic-lang.c">
+                               <FileConfiguration Name="Debug|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_lang"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Debug|x64">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_lang"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_lang"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|x64">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_lang"
+                                       />
+                               </FileConfiguration>
+                       </File>
 #include "libpango.sourcefiles"
 #include "mini-fribidi/libmini-fribidi.sourcefiles"
                </Filter>

diff --git a/build/win32/vs9/pangoft2.vcprojin b/build/win32/vs9/pangoft2.vcprojin
index 50a757a..caf6e92 100644 (file)
--- a/build/win32/vs9/pangoft2.vcprojin
+++ b/build/win32/vs9/pangoft2.vcprojin
@@ -159,23 +159,248 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\..\..\modules\arabic\arabic-fc.c" />
+                       <File RelativePath="..\..\..\modules\arabic\arabic-fc.c">
+                               <FileConfiguration Name="Debug|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Debug|x64">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|x64">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_fc"
+                                       />
+                               </FileConfiguration>
+                       </File>
                        <File RelativePath="..\..\..\modules\arabic\arabic-ot.c" />
-                       <File RelativePath="..\..\..\modules\basic\basic-fc.c" />
-                       <File RelativePath="..\..\..\modules\hangul\hangul-fc.c" />
-                       <File RelativePath="..\..\..\modules\hebrew\hebrew-fc.c" />
+                       <File RelativePath="..\..\..\modules\basic\basic-fc.c">
+                               <FileConfiguration Name="Debug|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Debug|x64">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|x64">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_fc"
+                                       />
+                               </FileConfiguration>
+                       </File>
+                       <File RelativePath="..\..\..\modules\hangul\hangul-fc.c">
+                               <FileConfiguration Name="Debug|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hangul_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Debug|x64">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hangul_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hangul_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|x64">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hangul_fc"
+                                       />
+                               </FileConfiguration>
+                       </File>
+                       <File RelativePath="..\..\..\modules\hebrew\hebrew-fc.c">
+                               <FileConfiguration Name="Debug|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hebrew_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Debug|x64">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hebrew_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hebrew_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|x64">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hebrew_fc"
+                                       />
+                               </FileConfiguration>
+                       </File>
                        <File RelativePath="..\..\..\modules\hebrew\hebrew-shaper.c" />
-                       <File RelativePath="..\..\..\modules\indic\indic-fc.c" />
+                       <File RelativePath="..\..\..\modules\indic\indic-fc.c">
+                               <FileConfiguration Name="Debug|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Debug|x64">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|x64">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_fc"
+                                       />
+                               </FileConfiguration>
+                       </File>
                        <File RelativePath="..\..\..\modules\indic\indic-ot.c" />
                        <File RelativePath="..\..\..\modules\indic\indic-ot-class-tables.c" />
                        <File RelativePath="..\..\..\modules\indic\mprefixups.c" />
-                       <File RelativePath="..\..\..\modules\khmer\khmer-fc.c" />
-                       <File RelativePath="..\..\..\modules\syriac\syriac-fc.c" />
+                       <File RelativePath="..\..\..\modules\khmer\khmer-fc.c">
+                               <FileConfiguration Name="Debug|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_khmer_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Debug|x64">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_khmer_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_khmer_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|x64">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_khmer_fc"
+                                       />
+                               </FileConfiguration>
+                       </File>
+                       <File RelativePath="..\..\..\modules\syriac\syriac-fc.c">
+                               <FileConfiguration Name="Debug|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_syriac_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Debug|x64">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_syriac_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_syriac_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|x64">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_syriac_fc"
+                                       />
+                               </FileConfiguration>
+                       </File>
                        <File RelativePath="..\..\..\modules\syriac\syriac-ot.c" />
                        <File RelativePath="..\..\..\modules\thai\thai-charprop.c" />
-                       <File RelativePath="..\..\..\modules\thai\thai-fc.c" />
+                       <File RelativePath="..\..\..\modules\thai\thai-fc.c">
+                               <FileConfiguration Name="Debug|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_thai_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Debug|x64">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_thai_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_thai_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|x64">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_thai_fc"
+                                       />
+                               </FileConfiguration>
+                       </File>
                        <File RelativePath="..\..\..\modules\thai\thai-shaper.c" />
-                       <File RelativePath="..\..\..\modules\tibetan\tibetan-fc.c" />
+                       <File RelativePath="..\..\..\modules\tibetan\tibetan-fc.c">
+                               <FileConfiguration Name="Debug|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_tibetan_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Debug|x64">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_tibetan_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_tibetan_fc"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|x64">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_tibetan_fc"
+                                       />
+                               </FileConfiguration>
+                       </File>
 #include "opentype/libharfbuzz.sourcefiles"
 #include "libpangoft2.sourcefiles"
                </Filter>

diff --git a/modules/arabic/arabic-fc.c b/modules/arabic/arabic-fc.c
index 0710ac9..4b024e1 100644 (file)
--- a/modules/arabic/arabic-fc.c
+++ b/modules/arabic/arabic-fc.c
@@ -27,10 +27,6 @@
 
 #include "arabic-ot.h"
 
-#if defined(G_OS_WIN32) && !defined(PANGO_MODULE_PREFIX)
-#define PANGO_MODULE_PREFIX _pango_arabic_fc
-#endif
-
 #include "pango-engine.h"
 #include "pango-utils.h"
 #include "pangofc-font.h"

diff --git a/modules/arabic/arabic-lang.c b/modules/arabic/arabic-lang.c
index 60fa11e..ee23bad 100644 (file)
--- a/modules/arabic/arabic-lang.c
+++ b/modules/arabic/arabic-lang.c
@@ -25,10 +25,6 @@
 #include "config.h"
 #include <string.h>
 
-#if defined(G_OS_WIN32) && !defined(PANGO_MODULE_PREFIX)
-#define PANGO_MODULE_PREFIX _pango_arabic_lang
-#endif
-
 #include "pango-engine.h"
 #include "pango-break.h"
 

diff --git a/modules/basic/basic-fc.c b/modules/basic/basic-fc.c
index 3f349d2..e3852c3 100644 (file)
--- a/modules/basic/basic-fc.c
+++ b/modules/basic/basic-fc.c
@@ -27,10 +27,6 @@
 
 #include <glib/gprintf.h>
 
-#if defined(G_OS_WIN32) && !defined(PANGO_MODULE_PREFIX)
-#define PANGO_MODULE_PREFIX _pango_basic_fc
-#endif
-
 #include "pango-engine.h"
 #include "pango-utils.h"
 #include "pangofc-font.h"

diff --git a/modules/hangul/hangul-fc.c b/modules/hangul/hangul-fc.c
index 18a9c61..7692a84 100644 (file)
--- a/modules/hangul/hangul-fc.c
+++ b/modules/hangul/hangul-fc.c
@@ -23,10 +23,6 @@
 #include "config.h"
 #include <string.h>
 
-#if defined(G_OS_WIN32) && !defined(PANGO_MODULE_PREFIX)
-#define PANGO_MODULE_PREFIX _pango_hangul_fc
-#endif
-
 #include "pango-engine.h"
 #include "pango-utils.h"
 #include "pangofc-font.h"

diff --git a/modules/hebrew/hebrew-fc.c b/modules/hebrew/hebrew-fc.c
index e668b87..12f25c5 100644 (file)
--- a/modules/hebrew/hebrew-fc.c
+++ b/modules/hebrew/hebrew-fc.c
@@ -28,10 +28,6 @@
 
 #include <pango/pango-ot.h>
 
-#if defined(G_OS_WIN32) && !defined(PANGO_MODULE_PREFIX)
-#define PANGO_MODULE_PREFIX _pango_hebrew_fc
-#endif
-
 #include "pango-engine.h"
 #include "pango-utils.h"
 #include "pangofc-font.h"

diff --git a/modules/indic/indic-fc.c b/modules/indic/indic-fc.c
index 0f8a767..3a232be 100644 (file)
--- a/modules/indic/indic-fc.c
+++ b/modules/indic/indic-fc.c
@@ -27,10 +27,6 @@
 
 #include "indic-ot.h"
 
-#if defined(G_OS_WIN32) && !defined(PANGO_MODULE_PREFIX)
-#define PANGO_MODULE_PREFIX _pango_indic_fc
-#endif
-
 #include "pango-engine.h"
 #include "pango-ot.h"
 #include "pango-utils.h"

diff --git a/modules/indic/indic-lang.c b/modules/indic/indic-lang.c
index 84f3e49..dc01b6f 100644 (file)
--- a/modules/indic/indic-lang.c
+++ b/modules/indic/indic-lang.c
@@ -23,10 +23,6 @@
 #include "config.h"
 #include <string.h>
 
-#if defined(G_OS_WIN32) && !defined(PANGO_MODULE_PREFIX)
-#define PANGO_MODULE_PREFIX _pango_indic_lang
-#endif
-
 #include "pango-engine.h"
 #include "pango-break.h"
 

diff --git a/modules/khmer/khmer-fc.c b/modules/khmer/khmer-fc.c
index eb5e24b..14357d7 100644 (file)
--- a/modules/khmer/khmer-fc.c
+++ b/modules/khmer/khmer-fc.c
@@ -59,10 +59,6 @@
 #include "config.h"
 #include <string.h>
 
-#if defined(G_OS_WIN32) && !defined(PANGO_MODULE_PREFIX)
-#define PANGO_MODULE_PREFIX _pango_khmer_fc
-#endif
-
 #include "pango-engine.h"
 #include "pango-ot.h"
 #include "pango-utils.h"

diff --git a/modules/syriac/syriac-fc.c b/modules/syriac/syriac-fc.c
index 9b8e3c9..7ba05fb 100644 (file)
--- a/modules/syriac/syriac-fc.c
+++ b/modules/syriac/syriac-fc.c
@@ -28,10 +28,6 @@
 
 #include "syriac-ot.h"
 
-#if defined(G_OS_WIN32) && !defined(PANGO_MODULE_PREFIX)
-#define PANGO_MODULE_PREFIX _pango_syriac_fc
-#endif
-
 #include "pango-engine.h"
 #include "pango-utils.h"
 #include "pangofc-font.h"

diff --git a/modules/thai/thai-fc.c b/modules/thai/thai-fc.c
index 7e4f2d0..80c945d 100644 (file)
--- a/modules/thai/thai-fc.c
+++ b/modules/thai/thai-fc.c
@@ -33,10 +33,6 @@
 #include <glib.h>
 #include "pango-ot.h"
 
-#if defined(G_OS_WIN32) && !defined(PANGO_MODULE_PREFIX)
-#define PANGO_MODULE_PREFIX _pango_thai_fc
-#endif
-
 #include "pango-engine.h"
 #include "pangofc-font.h"
 

diff --git a/modules/tibetan/tibetan-fc.c b/modules/tibetan/tibetan-fc.c
index 0c94f21..4e89416 100644 (file)
--- a/modules/tibetan/tibetan-fc.c
+++ b/modules/tibetan/tibetan-fc.c
@@ -67,10 +67,6 @@
 #include "config.h"
 #include <string.h>
 
-#if defined(G_OS_WIN32) && !defined(PANGO_MODULE_PREFIX)
-#define PANGO_MODULE_PREFIX _pango_tibetan_fc
-#endif
-
 #include "pango-engine.h"
 #include "pango-ot.h"
 #include "pango-utils.h"