[pango] MSVC Builds: Restore MSVC 2008/2010 Project Generation

From: Chun-wei Fan <fanchunwei src gnome org>
To: commits-list gnome org
Cc:
Subject: [pango] MSVC Builds: Restore MSVC 2008/2010 Project Generation
Date: Wed, 8 Apr 2015 02:16:06 +0000 (UTC)
commit 8e772f8c8bbfcb2bcbcf3bfe40945a49ff4d5e25
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Apr 7 18:07:53 2015 +0800

    MSVC Builds: Restore MSVC 2008/2010 Project Generation
    
    ... in a way that 'make distcheck' (with or without -jN) completes
    successfully.  This uses the common autotools module that was added in
    a previous commit so that we just need to define the items needed and call
    the things in there during 'make dist' (or 'make distcheck'), which would
    have things in a more tidy manner for this.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=735039

 build/win32/vs10/Makefile.am                       |   60 ++++++++++---------
 build/win32/vs10/pango-install.propsin             |   32 +----------
 build/win32/vs10/pango.vcxproj.filtersin           |    3 +-
 build/win32/vs10/pango.vcxprojin                   |    3 +-
 build/win32/vs10/pangocairo.vcxproj.filtersin      |    4 +-
 build/win32/vs10/pangocairo.vcxprojin              |    2 +-
 build/win32/vs10/pangoft2.vcxproj.filtersin        |    5 +-
 build/win32/vs10/pangoft2.vcxprojin                |    8 +--
 build/win32/vs10/pangowin32.vcxproj.filters        |   39 -------------
 build/win32/vs10/pangowin32.vcxproj.filtersin      |   23 ++++++++
 .../{pangowin32.vcxproj => pangowin32.vcxprojin}   |   11 +---
 build/win32/vs9/Makefile.am                        |   43 ++++++++-------
 build/win32/vs9/pango-install.vspropsin            |   19 +-----
 build/win32/vs9/pango.vcprojin                     |    3 +-
 build/win32/vs9/pangocairo.vcprojin                |    2 +-
 build/win32/vs9/pangoft2.vcprojin                  |    8 +--
 .../vs9/{pangowin32.vcproj => pangowin32.vcprojin} |   11 +---
 pango/Makefile.am                                  |   45 +++++++++++++++
 18 files changed, 142 insertions(+), 179 deletions(-)
---
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index 04318d6..834fde2 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -1,34 +1,38 @@
-EXTRA_DIST =   \
-       pango.sln       \
-       pango-build-defines.props       \
-       pango-ignore-fc.props   \
-       pango-install-bin.props \
-       pango-install.props     \
-       pango-install.propsin   \
-       pango-prebuild.props    \
-       pango-version-paths.props       \
-       pango.vcxproj   \
-       pango.vcxproj.filters   \
-       pango.vcxprojin \
-       pango.vcxproj.filtersin \
-       pangoft2.vcxproj        \
-       pangoft2.vcxproj.filters        \
-       pangoft2.vcxprojin      \
-       pangoft2.vcxproj.filtersin      \
-       pangowin32.vcxproj      \
+GENERATED_ITEMS =                      \
+       pango.vcxproj                   \
+       pango.vcxproj.filters           \
+       pangowin32.vcxproj              \
        pangowin32.vcxproj.filters      \
-       pangocairo.vcxproj      \
+       pangoft2.vcxproj                \
+       pangoft2.vcxproj.filters        \
+       pangocairo.vcxproj              \
        pangocairo.vcxproj.filters      \
-       pangocairo.vcxprojin    \
-       pangocairo.vcxproj.filtersin    \
-       pango-install.vcxproj   \
-       README.txt
+       pango-install.props
+
+EXTRA_DIST =   \
+       pango.sln                               \
+       pango-build-defines.props               \
+       pango-ignore-fc.props                   \
+       pango-install-bin.props                 \
+       pango-install.propsin                   \
+       pango-prebuild.props                    \
+       pango-version-paths.props               \
+       pango.vcxprojin                         \
+       pango.vcxproj.filtersin                 \
+       pangoft2.vcxprojin                      \
+       pangoft2.vcxproj.filtersin              \
+       pangowin32.vcxprojin                    \
+       pangowin32.vcxproj.filtersin            \
+       pangocairo.vcxprojin                    \
+       pangocairo.vcxproj.filtersin            \
+       pango-install.vcxproj                   \
+       README.txt                              \
+       $(GENERATED_ITEMS)
 
-# TODO rewrite in a way that doesn't break make distcheck
-#pango-install.props: $(top_srcdir)/build/win32/vs10/pango-install.propsin pango.vs10.headers
-#      $(CPP) -P - <$(top_srcdir)/build/win32/vs10/pango-install.propsin >$@
-#      rm pango.vs10.headers
+pango-install.props: $(top_srcdir)/build/win32/vs10/pango-install.propsin pango.vs10.headers
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/pango-install.propsin >$@
+       rm pango.vs10.headers
 
-DISTCLEANFILES = pango-install.props
+DISTCLEANFILES = $(GENERATED_ITEMS)
 
 -include $(top_srcdir)/git.mk
diff --git a/build/win32/vs10/pango-install.propsin b/build/win32/vs10/pango-install.propsin
index c252d9b..a366763 100644
--- a/build/win32/vs10/pango-install.propsin
+++ b/build/win32/vs10/pango-install.propsin
@@ -10,43 +10,15 @@
     <PangoInstallHeadersData>
 #include "pango.vs10.headers"
 
-copy ..\..\..\pango\pango-features.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango
-
-copy ..\..\..\pango\pango-enum-types.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango
-
-copy ..\..\..\pango\pangowin32.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango
-
-
-if "$(Configuration)" == "Release" goto DO_CREATE_PANGO_ALIASES
-
-if "$(Configuration)" == "Debug" goto DO_CREATE_PANGO_ALIASES
-
+if "$(Configuration)" == "Release" goto END
+if "$(Configuration)" == "Debug" goto END
 
 copy ..\..\..\pango\pangofc-decoder.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango
-
 copy ..\..\..\pango\pangofc-font.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango
-
 copy ..\..\..\pango\pangofc-fontmap.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango
-
 copy ..\..\..\pango\pango-ot.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango
-
 copy ..\..\..\pango\pangoft2.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango
 
-
-:DO_CREATE_PANGO_ALIASES
-
-if exist $(CopyDir)\etc\pango\pango.aliases goto END
-
-if not exist $(CopyDir)\etc\pango mkdir $(CopyDir)\etc\pango
-
-echo tahoma = "tahoma,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal" > 
$(CopyDir)\etc\pango\pango.aliases
-
-echo sans = "arial,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal" >> 
$(CopyDir)\etc\pango\pango.aliases
-
-echo serif = "times new roman,angsana new,mingliu,simsun,gulimche,ms gothic,latha,mangal" >> 
$(CopyDir)\etc\pango\pango.aliases
-
-echo monospace = "courier new,courier monothai,mingliu,simsun,gulimche,ms gothic,latha,mangal" >> 
$(CopyDir)\etc\pango\pango.aliases
-
 :END
 </PangoInstallHeadersData>
   </PropertyGroup>
diff --git a/build/win32/vs10/pango.vcxproj.filtersin b/build/win32/vs10/pango.vcxproj.filtersin
index 2bf8b3b..9435a96 100644
--- a/build/win32/vs10/pango.vcxproj.filtersin
+++ b/build/win32/vs10/pango.vcxproj.filtersin
@@ -23,7 +23,6 @@
   <ItemGroup>
     <ClCompile Include="..\..\..\pango\break-arabic.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\pango\break-indic.c"><Filter>Source Files</Filter></ClCompile>
-#include "libpango.vs10.sourcefiles.filters"
-#include "libmini-fribidi.vs10.sourcefiles.filters"
+#include "pango.vs10.sourcefiles.filters"
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/pango.vcxprojin b/build/win32/vs10/pango.vcxprojin
index 8dfe808..16c5dec 100644
--- a/build/win32/vs10/pango.vcxprojin
+++ b/build/win32/vs10/pango.vcxprojin
@@ -160,8 +160,7 @@
   <ItemGroup>
     <ClCompile Include="..\..\..\pango\break-arabic.c" />
     <ClCompile Include="..\..\..\pango\break-indic.c" />
-#include "libpango.vs10.sourcefiles"
-#include "libmini-fribidi.vs10.sourcefiles"
+#include "pango.vs10.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\..\config.h.win32">
diff --git a/build/win32/vs10/pangocairo.vcxproj.filtersin b/build/win32/vs10/pangocairo.vcxproj.filtersin
index d3582b5..e60599f 100644
--- a/build/win32/vs10/pangocairo.vcxproj.filtersin
+++ b/build/win32/vs10/pangocairo.vcxproj.filtersin
@@ -24,6 +24,6 @@
     <ClCompile Include="..\..\..\pango\pangocairo-fcfontmap.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\pango\pangocairo-win32font.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\pango\pangocairo-win32fontmap.c"><Filter>Source Files</Filter></ClCompile>
-#include "libpangocairo.vs10.sourcefiles.filters"
+#include "pangocairo.vs10.sourcefiles.filters"
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/pangocairo.vcxprojin b/build/win32/vs10/pangocairo.vcxprojin
index 8f908ad..23ce597 100644
--- a/build/win32/vs10/pangocairo.vcxprojin
+++ b/build/win32/vs10/pangocairo.vcxprojin
@@ -335,7 +335,7 @@
     </ClCompile>
     <ClCompile Include="..\..\..\pango\pangocairo-win32font.c" />
     <ClCompile Include="..\..\..\pango\pangocairo-win32fontmap.c" />
-#include "libpangocairo.vs10.sourcefiles"
+#include "pangocairo.vs10.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="pango.vcxproj">
diff --git a/build/win32/vs10/pangoft2.vcxproj.filtersin b/build/win32/vs10/pangoft2.vcxproj.filtersin
index 26afcee..0dab6c7 100644
--- a/build/win32/vs10/pangoft2.vcxproj.filtersin
+++ b/build/win32/vs10/pangoft2.vcxproj.filtersin
@@ -18,7 +18,6 @@
     <ResourceCompile Include="..\..\..\pango\pangoft2.rc"><Filter>Resource Files</Filter></ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\modules\basic\basic-fc.c"><Filter>Source Files</Filter></ClCompile>
-#include "libpangoft2.vs10.sourcefiles.filters"
+#include "pangoft2.vs10.sourcefiles.filters"
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/pangoft2.vcxprojin b/build/win32/vs10/pangoft2.vcxprojin
index d5eb457..ae87922 100644
--- a/build/win32/vs10/pangoft2.vcxprojin
+++ b/build/win32/vs10/pangoft2.vcxprojin
@@ -166,13 +166,7 @@
     <ResourceCompile Include="..\..\..\pango\pangoft2.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\modules\basic\basic-fc.c">
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'">PANGO_MODULE_PREFIX=_pango_basic_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'">PANGO_MODULE_PREFIX=_pango_basic_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">PANGO_MODULE_PREFIX=_pango_basic_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">PANGO_MODULE_PREFIX=_pango_basic_fc;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-#include "libpangoft2.vs10.sourcefiles"
+#include "pangoft2.vs10.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="pango.vcxproj">
diff --git a/build/win32/vs10/pangowin32.vcxproj.filtersin b/build/win32/vs10/pangowin32.vcxproj.filtersin
new file mode 100644
index 0000000..78aff35
--- /dev/null
+++ b/build/win32/vs10/pangowin32.vcxproj.filtersin
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\pango\pangowin32.rc"><Filter>Resource Files</Filter></ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+#include "pangowin32.vs10.sourcefiles.filters"
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/pangowin32.vcxproj b/build/win32/vs10/pangowin32.vcxprojin
similarity index 90%
rename from build/win32/vs10/pangowin32.vcxproj
rename to build/win32/vs10/pangowin32.vcxprojin
index cc4ab77..ab58c27 100644
--- a/build/win32/vs10/pangowin32.vcxproj
+++ b/build/win32/vs10/pangowin32.vcxprojin
@@ -179,16 +179,7 @@
     <ResourceCompile Include="..\..\..\pango\pangowin32.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\modules\basic\basic-win32.c">
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PANGO_MODULE_PREFIX=_pango_basic_win32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">PANGO_MODULE_PREFIX=_pango_basic_win32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">PANGO_MODULE_PREFIX=_pango_basic_win32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">PANGO_MODULE_PREFIX=_pango_basic_win32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       </ClCompile>
-    <ClCompile Include="..\..\..\pango\module-defs-win32.c" />
-    <ClCompile Include="..\..\..\pango\pangowin32-fontcache.c" />
-    <ClCompile Include="..\..\..\pango\pangowin32-fontmap.c" />
-    <ClCompile Include="..\..\..\pango\pangowin32.c" />
+#include "pangowin32.vs10.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="pango.vcxproj">
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index 4645a6e..46b3ad4 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -1,28 +1,31 @@
+GENERATED_ITEMS =              \
+       pango.vcproj            \
+       pangowin32.vcproj       \
+       pangoft2.vcproj         \
+       pangocairo.vcproj       \
+       pango-install.vsprops
+
 EXTRA_DIST =   \
-       pango.sln       \
+       pango.sln                       \
        pango-build-defines.vsprops     \
-       pango-ignore-fc.vsprops \
+       pango-ignore-fc.vsprops         \
        pango-install-bin.vsprops       \
-       pango-install.vsprops   \
-       pango-install.vspropsin \
-       pango-prebuild.vsprops  \
+       pango-install.vspropsin         \
+       pango-prebuild.vsprops          \
        pango-version-paths.vsprops     \
-       pango.vcprojin  \
-       pango.vcproj    \
-       pangoft2.vcprojin       \
-       pangoft2.vcproj \
-       pangocairo.vcprojin     \
-       pangocairo.vcproj       \
-       pangowin32.vcproj       \
-       pango-install.vcproj    \
-       stdint.h        \
-       README.txt
+       pango.vcprojin                  \
+       pangoft2.vcprojin               \
+       pangocairo.vcprojin             \
+       pangowin32.vcprojin             \
+       pango-install.vcproj            \
+       stdint.h                        \
+       README.txt                      \
+       $(GENERATED_ITEMS)
 
-# TODO rewrite in a way that doesn't break make distcheck
-#pango-install.vsprops: $(top_srcdir)/build/win32/vs9/pango-install.vspropsin pango.vs9.headers
-#      $(CPP) -P - <$(top_srcdir)/build/win32/vs9/pango-install.vspropsin >$@
-#      rm pango.vs9.headers
+pango-install.vsprops: $(top_srcdir)/build/win32/vs9/pango-install.vspropsin pango.headers
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs9/pango-install.vspropsin >$@
+       rm pango.headers
 
-DISTCLEANFILES = pango-install.vsprops
+DISTCLEANFILES = $(GENERATED_ITEMS)
 
 -include $(top_srcdir)/git.mk
diff --git a/build/win32/vs9/pango-install.vspropsin b/build/win32/vs9/pango-install.vspropsin
index 44ace54..08c7a12 100644
--- a/build/win32/vs9/pango-install.vspropsin
+++ b/build/win32/vs9/pango-install.vspropsin
@@ -8,13 +8,10 @@
        <UserMacro
                Name="PangoInstallHeadersData"
                Value="
-#include "pango.vs9.headers"
-copy ..\..\..\pango\pango-features.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-enum-types.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pangowin32.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
+#include "pango.headers"
 
-if &quot;$(ConfigurationName)&quot; == &quot;Release&quot; goto DO_CREATE_PANGO_ALIASES&#x0D;&#x0A;
-if &quot;$(ConfigurationName)&quot; == &quot;Debug&quot; goto DO_CREATE_PANGO_ALIASES&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Release&quot; goto END&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Debug&quot; goto END&#x0D;&#x0A;
 
 copy ..\..\..\pango\pangofc-decoder.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
 copy ..\..\..\pango\pangofc-font.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
@@ -22,15 +19,7 @@ copy ..\..\..\pango\pangofc-fontmap.h $(CopyDir)\include\pango-$(PangoApiVersion
 copy ..\..\..\pango\pango-ot.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
 copy ..\..\..\pango\pangoft2.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
 
-:DO_CREATE_PANGO_ALIASES&#x0D;&#x0A;
-
-if exist $(CopyDir)\etc\pango\pango.aliases goto END&#x0D;&#x0A;
-if not exist $(CopyDir)\etc\pango mkdir $(CopyDir)\etc\pango&#x0D;&#x0A;
-echo tahoma = &quot;tahoma,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal&quot; > 
$(CopyDir)\etc\pango\pango.aliases&#x0D;&#x0A;
-echo sans = &quot;arial,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal&quot; >> 
$(CopyDir)\etc\pango\pango.aliases&#x0D;&#x0A;
-echo serif = &quot;times new roman,angsana new,mingliu,simsun,gulimche,ms gothic,latha,mangal&quot; >> 
$(CopyDir)\etc\pango\pango.aliases&#x0D;&#x0A;
-echo monospace = &quot;courier new,courier monothai,mingliu,simsun,gulimche,ms gothic,latha,mangal&quot; >> 
$(CopyDir)\etc\pango\pango.aliases&#x0D;&#x0A;
-:END
+:END&#x0D;&#x0A;
 "
        />
 </VisualStudioPropertySheet>
diff --git a/build/win32/vs9/pango.vcprojin b/build/win32/vs9/pango.vcprojin
index bf86e07..1e2b8c6 100644
--- a/build/win32/vs9/pango.vcprojin
+++ b/build/win32/vs9/pango.vcprojin
@@ -191,8 +191,7 @@
                        >
                        <File RelativePath="..\..\..\pango\break-arabic.c" />
                        <File RelativePath="..\..\..\pango\break-indic.c" />
-#include "libpango.sourcefiles"
-#include "libmini-fribidi.sourcefiles"
+#include "pango.sourcefiles"
                </Filter>
        </Files>
 </VisualStudioProject>
diff --git a/build/win32/vs9/pangocairo.vcprojin b/build/win32/vs9/pangocairo.vcprojin
index 508072e..570ad66 100644
--- a/build/win32/vs9/pangocairo.vcprojin
+++ b/build/win32/vs9/pangocairo.vcprojin
@@ -307,7 +307,7 @@
                        </File>
                        <File RelativePath="..\..\..\pango\pangocairo-win32font.c" />
                        <File RelativePath="..\..\..\pango\pangocairo-win32fontmap.c" />
-#include "libpangocairo.sourcefiles"
+#include "pangocairo.sourcefiles"
                </Filter>
        </Files>
 </VisualStudioProject>
diff --git a/build/win32/vs9/pangoft2.vcprojin b/build/win32/vs9/pangoft2.vcprojin
index e4cdfa9..1868e9e 100644
--- a/build/win32/vs9/pangoft2.vcprojin
+++ b/build/win32/vs9/pangoft2.vcprojin
@@ -168,13 +168,7 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\..\..\modules\basic\basic-fc.c">
-                               <FileConfiguration Name="Debug_FC|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_fc" /></FileConfiguration>
-                               <FileConfiguration Name="Release_FC|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_fc" /></FileConfiguration>
-                               <FileConfiguration Name="Debug_FC|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_fc" /></FileConfiguration>
-                               <FileConfiguration Name="Release_FC|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_fc" /></FileConfiguration>
-                       </File>
-#include "libpangoft2.sourcefiles"
+#include "pangoft2.sourcefiles"
                </Filter>
        </Files>
 </VisualStudioProject>
diff --git a/build/win32/vs9/pangowin32.vcproj b/build/win32/vs9/pangowin32.vcprojin
similarity index 82%
rename from build/win32/vs9/pangowin32.vcproj
rename to build/win32/vs9/pangowin32.vcprojin
index 585c406..aa38b1a 100644
--- a/build/win32/vs9/pangowin32.vcproj
+++ b/build/win32/vs9/pangowin32.vcprojin
@@ -164,16 +164,7 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\..\..\modules\basic\basic-win32.c" >
-                               <FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool"     
PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_win32" /></FileConfiguration>
-                               <FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_win32" /></FileConfiguration>
-                               <FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_win32" /></FileConfiguration>
-                               <FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" 
PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_win32" /></FileConfiguration>
-                       </File>
-                       <File RelativePath="..\..\..\pango\module-defs-win32.c" />
-                       <File RelativePath="..\..\..\pango\pangowin32-fontcache.c" />
-                       <File RelativePath="..\..\..\pango\pangowin32-fontmap.c" />
-                       <File RelativePath="..\..\..\pango\pangowin32.c" />
+#include "pangowin32.sourcefiles"
                </Filter>
        </Files>
        <Globals>
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 38e92a0..56b9f7b 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -454,6 +454,51 @@ MOSTLYCLEANFILES =                 \
 DISTCLEANFILES =               \
        pango-features.h
 
+# ------------------- MSVC Build Items ----------------
+
+extra_fribidi_srcs_for_msvc =  \
+       mini-fribidi/fribidi.c                  \
+       mini-fribidi/fribidi_char_type.c        \
+       mini-fribidi/fribidi_types.c
+
+MSVCPROJS = pango pangowin32 pangoft2 pangocairo
+
+pango_FILES =  \
+       $(extra_fribidi_srcs_for_msvc)  \
+       $(libpango_1_0_la_SOURCES)
+pango_EXCLUDES = dummy
+pango_HEADERS_DIR = $(pangoincludedir)
+
+# We can't just use $(pangoinclude_HEADERS), due to different platforms this may run on.
+# We don't include the pangoft2 headers here, as it is optional on Windows Builds.
+pango_HEADERS_INST =   \
+       $(pango_headers)        \
+       $(pangocairo_headers)   \
+       pangowin32.h            \
+       pango-features.h        \
+       pango-enum-types.h
+
+pango_HEADERS_EXCLUDES = dummy
+
+pangowin32_FILES = $(libpangowin32_1_0_la_SOURCES)
+pangowin32_EXCLUDES = dummy
+
+pangoft2_FILES = $(libpangoft2_1_0_la_SOURCES)
+pangoft2_EXCLUDES = dummy
+
+# Again, can't use $(libpangocairo_1_0_la_SOURCES), due to different platforms this may run on.
+pangocairo_FILES = $(pangocairo_core_sources)
+pangocairo_EXCLUDES = dummy
+
+include $(top_srcdir)/build/Makefile.msvcproj
+
+dist-hook: \
+       $(top_builddir)/build/win32/vs9/pango.vcproj            \
+       $(top_builddir)/build/win32/vs9/pangowin32.vcproj       \
+       $(top_builddir)/build/win32/vs9/pangoft2.vcproj         \
+       $(top_builddir)/build/win32/vs9/pangocairo.vcproj       \
+       $(top_builddir)/build/win32/vs9/pango.headers
+
 install-exec-hook:
 if DISABLE_EXPLICIT_DEPS
        -for i in libpangoft2-$(PANGO_API_VERSION).la libpangoxft-$(PANGO_API_VERSION).la 
libpangowin32-$(PANGO_API_VERSION).la; do \
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]