[cogl/msvc-support: 2/4] Update autotools files



commit c4dd10063ec808d75101b4864266904efd026af0
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu May 12 17:20:59 2011 +0800

    Update autotools files
    
    -Have configure.ac expand the config.h.win32.in into config.h.win32
     with the correct versioning info, etc, and to include the Visual C++
     project files for distribution
    -Added rules in cogl/Makefile.am to expand the cogl VS 2008/2010 projects
     and filters from the templates with up-to-date source file listings, to
     distribute cogl-enum-types.c, cogl-enum-types.h to ease compilation and
     to avoid depending on PERL on Windows installations.
    -Added rules in cogl-pango/Makefile.am to expand the cogl-pango VS2008/
     2010 projects and filters from the templates with up-to-date source file
     listings.
    -Added/edited various Makefile.am's in build to distribute the VS2008/2010
     project files and associated items required for the build.

 Makefile.am                  |    4 +-
 build/Makefile.am            |    1 +
 build/win32/Makefile.am      |    1 +
 build/win32/vs10/Makefile.am |   15 ++++++++++++++
 build/win32/vs9/Makefile.am  |   10 +++++++++
 cogl-pango/Makefile.am       |   36 ++++++++++++++++++++++++++++++++++
 cogl/Makefile.am             |   44 ++++++++++++++++++++++++++++++++++++++++++
 configure.ac                 |    5 ++++
 8 files changed, 114 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ed547d0..4e08df2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,8 @@ if BUILD_COGL_PANGO
 SUBDIRS += cogl-pango
 endif
 
-SUBDIRS += examples doc po
+SUBDIRS += examples doc po build
 
 ACLOCAL_AMFLAGS = -I build/autotools ${ACLOCAL_FLAGS}
 
-EXTRA_DIST = README.in
+EXTRA_DIST = README.in README config.h.win32 config.h.win32.in
diff --git a/build/Makefile.am b/build/Makefile.am
new file mode 100644
index 0000000..0f81afe
--- /dev/null
+++ b/build/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = win32
diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
new file mode 100644
index 0000000..c8cd71a
--- /dev/null
+++ b/build/win32/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = vs9 vs10
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
new file mode 100644
index 0000000..41bf952
--- /dev/null
+++ b/build/win32/vs10/Makefile.am
@@ -0,0 +1,15 @@
+EXTRA_DIST = \
+	cogl.sln		\
+	cogl.props	\
+	cogl.vcxproj		\
+	cogl.vcxprojin		\
+	cogl.vcxproj.filters		\
+	cogl.vcxproj.filtersin		\
+	cogl-pango.vcxproj	\
+	cogl-pango.vcxprojin	\
+	cogl-pango.vcxproj.filters	\
+	cogl-pango.vcxproj.filtersin	\
+	hello.vcxproj	\
+	hello.vcxproj.filters	\
+	install.vcxproj	\
+	README.txt
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
new file mode 100644
index 0000000..1ad33c5
--- /dev/null
+++ b/build/win32/vs9/Makefile.am
@@ -0,0 +1,10 @@
+EXTRA_DIST = \
+	cogl.sln		\
+	cogl.vsprops	\
+	cogl.vcproj		\
+	cogl.vcprojin		\
+	cogl-pango.vcproj	\
+	cogl-pango.vcprojin	\
+	hello.vcproj	\
+	install.vcproj	\
+	README.txt
diff --git a/cogl-pango/Makefile.am b/cogl-pango/Makefile.am
index 0971529..9fae11a 100644
--- a/cogl-pango/Makefile.am
+++ b/cogl-pango/Makefile.am
@@ -55,6 +55,42 @@ pkgconfig_DATA = $(pc_files)
 EXTRA_DIST += cogl-pango.pc.in
 DISTCLEANFILES += $(pc_files)
 
+dist-hook: ../build/win32/vs9/cogl-pango.vcproj ../build/win32/vs10/cogl-pango.vcxproj ../build/win32/vs10/cogl-pango.vcxproj.filters
+
+../build/win32/vs9/cogl-pango.vcproj: $(top_srcdir)/build/win32/vs9/cogl-pango.vcprojin
+	for F in $(source_c); do \
+		case $$F in \
+		*.c)	echo '   <File RelativePath="..\..\..\cogl-pango\'$$F'" />' \
+			;; \
+		esac; \
+	done >coglpango.sourcefiles
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/cogl-pango.vcprojin >$@
+	rm coglpango.sourcefiles
+	
+../build/win32/vs10/cogl-pango.vcxproj: $(top_srcdir)/build/win32/vs10/cogl-pango.vcxprojin
+	for F in $(source_c); do \
+		case $$F in \
+		*.c)	echo '    <ClCompile Include="..\..\..\cogl-pango\'$$F'" />' \
+			;; \
+		esac; \
+	done >coglpango.vs10.sourcefiles
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/cogl-pango.vcxprojin >$@
+	rm coglpango.vs10.sourcefiles
+	
+../build/win32/vs10/cogl-pango.vcxproj.filters: $(top_srcdir)/build/win32/vs10/cogl-pango.vcxproj.filtersin
+	for F in $(source_c); do \
+		case $$F in \
+		*.c)	echo '    <ClCompile Include="..\..\..\cogl-pango\'$$F'"><Filter>Sources</Filter></ClCompile>' \
+			;; \
+		esac; \
+	done >coglpango.vs10.sourcefiles.filters
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/cogl-pango.vcxproj.filtersin >$@
+	rm coglpango.vs10.sourcefiles.filters
+
+EXTRA_DIST += cogl-pango.symbols
+
+DISTCLEANFILES += ../build/win32/vs9/cogl-pango.vcproj ../build/win32/vs10/cogl-pango.vcxproj ../build/win32/vs10/cogl-pango.vcxproj.filters
+
 -include $(INTROSPECTION_MAKEFILE)
 
 INTROSPECTION_GIRS =
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index f8e4f57..09ddd7b 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -380,6 +380,50 @@ coglincludedir = $(includedir)/cogl/cogl
 coglinclude_HEADERS = $(cogl_headers) $(cogl_experimental_h)
 nodist_coglinclude_HEADERS = cogl-defines.h cogl-enum-types.h
 
+dist-hook: ../build/win32/vs9/cogl.vcproj ../build/win32/vs10/cogl.vcxproj ../build/win32/vs10/cogl.vcxproj.filters
+
+# I know those filters below don't look nice, but this is to ensure the right files are in the Project files only *once*
+../build/win32/vs9/cogl.vcproj: $(top_srcdir)/build/win32/vs9/cogl.vcprojin
+	for F in `echo $(cogl_sources_c) $(BUILT_SOURCES) | tr '/' '\\'`; do \
+		case $$F in \
+		*-egl.c|*-glx.c|*-xlib.c|*-x11.c|*.wgl.c|*-gl.c|*-gles.c|*-stub.c|*.h) ;; \
+		*.c)	echo '   <File RelativePath="..\..\..\cogl\'$$F'" />' \
+			;; \
+		esac; \
+	done >cogl.sourcefiles
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/cogl.vcprojin >$@
+	rm cogl.sourcefiles
+	
+../build/win32/vs10/cogl.vcxproj: $(top_srcdir)/build/win32/vs10/cogl.vcxprojin
+	for F in `echo $(cogl_sources_c) $(BUILT_SOURCES) | tr '/' '\\'`; do \
+		case $$F in \
+		*-egl.c|*-glx.c|*-xlib.c|*-x11.c|*.wgl.c|*-gl.c|*-gles.c|*-stub.c|*.h) ;; \
+		*.c)	echo '    <ClCompile Include="..\..\..\cogl\'$$F'" />' \
+			;; \
+		esac; \
+	done >cogl.vs10.sourcefiles
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/cogl.vcxprojin >$@
+	rm cogl.vs10.sourcefiles
+	
+../build/win32/vs10/cogl.vcxproj.filters: $(top_srcdir)/build/win32/vs10/cogl.vcxproj.filtersin
+	for F in `echo $(cogl_sources_c) $(BUILT_SOURCES) | tr '/' '\\'`; do \
+		case $$F in \
+		*-egl.c|*-glx.c|*-xlib.c|*-x11.c|*.wgl.c|*-gl.c|*-gles.c|*-stub.c|*.h) ;; \
+		*.c)	echo '    <ClCompile Include="..\..\..\cogl\'$$F'"><Filter>Sources</Filter></ClCompile>' \
+			;; \
+		esac; \
+	done >cogl.vs10.sourcefiles.filters
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/cogl.vcxproj.filtersin >$@
+	rm cogl.vs10.sourcefiles.filters
+
+EXTRA_DIST += \
+	cogl-defines.h.win32	\
+	cogl-enum-types.h		\
+	cogl-enum-types.c		\
+	cogl.symbols
+
+DISTCLEANFILES += ../build/win32/vs9/cogl.vcproj ../build/win32/vs10/cogl.vcxproj ../build/win32/vs10/cogl.vcxproj.filters
+
 -include $(INTROSPECTION_MAKEFILE)
 
 INTROSPECTION_GIRS =
diff --git a/configure.ac b/configure.ac
index baa4109..8163cc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -781,6 +781,11 @@ AC_SUBST(MAINTAINER_CFLAGS)
 AC_OUTPUT(
 Makefile
 README
+config.h.win32
+build/Makefile
+build/win32/Makefile
+build/win32/vs9/Makefile
+build/win32/vs10/Makefile
 cogl/Makefile
 cogl/cogl-1.0.pc
 cogl/cogl-$COGL_MAJOR_VERSION.0.pc:cogl/cogl.pc.in



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]