diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2012-02-10 11:07:41 +0800 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2012-02-13 12:22:19 +0000 |
| commit | 9b87e8602cdac839edd82c3a0c0974ebf20bc7fe (patch) | |
| tree | 88214e718a8f3d82acb12fccf514c147886c8ca2 | |
| parent | 596ff72dc9ccbb494404e37df93882d362295bec (diff) | |
| download | cogl-9b87e8602cdac839edd82c3a0c0974ebf20bc7fe.tar.gz | |
cogl/Makefile.am: Filter out SDL winsys for Visual C++ builds
Just being a bit paranoid here, as the SDL winsys sources are dealt in the
projects as they are not built for all configurations to avoid them
included more than once in the projects, which can cause trouble.
https://bugzilla.gnome.org/show_bug.cgi?id=669785
Reviewed-by: Neil Roberts <neil@linux.intel.com>
| -rw-r--r-- | cogl/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cogl/Makefile.am b/cogl/Makefile.am index 8cfe317d..7dd4e7e6 100644 --- a/cogl/Makefile.am +++ b/cogl/Makefile.am @@ -476,7 +476,7 @@ dist-hook: ../build/win32/vs9/cogl.vcproj ../build/win32/vs10/cogl.vcxproj ../bu ../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|*-kms.c|*.h) ;; \ + *-egl.c|*-glx.c|*-xlib*.c|*-x11.c|*.wgl.c|*-gl.c|*-gles.c|*-kms.c|*-sdl.c|*.h) ;; \ *.c) echo ' <File RelativePath="..\..\..\cogl\'$$F'" />' \ ;; \ esac; \ @@ -487,7 +487,7 @@ dist-hook: ../build/win32/vs9/cogl.vcproj ../build/win32/vs10/cogl.vcxproj ../bu ../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|*-kms.c|*.h) ;; \ + *-egl.c|*-glx.c|*-xlib*.c|*-x11.c|*.wgl.c|*-gl.c|*-gles.c|*-kms.c|*-sdl.c|*.h) ;; \ *.c) echo ' <ClCompile Include="..\..\..\cogl\'$$F'" />' \ ;; \ esac; \ @@ -498,7 +498,7 @@ dist-hook: ../build/win32/vs9/cogl.vcproj ../build/win32/vs10/cogl.vcxproj ../bu ../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|*-kms.c|*.h) ;; \ + *-egl.c|*-glx.c|*-xlib*.c|*-x11.c|*.wgl.c|*-gl.c|*-gles.c|*-kms.c|*-sdl.c|*.h) ;; \ *.c) echo ' <ClCompile Include="..\..\..\cogl\'$$F'"><Filter>Sources</Filter></ClCompile>' \ ;; \ esac; \ |