[cogl/cogl-latest-win: 21/21] build: Drop the Visual Studio projects
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/cogl-latest-win: 21/21] build: Drop the Visual Studio projects
- Date: Tue, 19 Oct 2021 07:35:05 +0000 (UTC)
commit 580b751a2f727c8551f7c26e0698db1532ac721e
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Mon Oct 18 18:37:46 2021 +0800
build: Drop the Visual Studio projects
They have been replaced by the NMake Makefiles, which will take over
their places in build/win32.
.gitignore | 1 -
build/Makefile-msvcproj.mak | 56 --
build/Makefile.am | 2 +-
build/nmake/Makefile.am | 10 -
build/win32/Makefile.am | 13 +-
build/{nmake => win32}/Makefile.vc | 0
build/{nmake => win32}/build-rules-msvc.mak | 0
build/{nmake => win32}/config-msvc.mak | 0
build/{nmake => win32}/create-lists-msvc.mak | 0
build/{nmake => win32}/create-lists.bat | 0
build/{nmake => win32}/detectenv-msvc.mak | 0
build/{nmake => win32}/generate-msvc.mak | 0
build/{nmake => win32}/info-msvc.mak | 0
build/{nmake => win32}/install.mak | 0
build/win32/vs10/Makefile.am | 34 -
build/win32/vs10/README.txt | 89 ---
build/win32/vs10/cogl-build-defines.props | 61 --
build/win32/vs10/cogl-crate.vcxproj | 176 ------
build/win32/vs10/cogl-crate.vcxproj.filters | 14 -
build/win32/vs10/cogl-gen-srcs.props | 107 ----
build/win32/vs10/cogl-hello.vcxproj | 160 -----
build/win32/vs10/cogl-hello.vcxproj.filters | 14 -
build/win32/vs10/cogl-info.vcxproj | 168 -----
build/win32/vs10/cogl-info.vcxproj.filters | 14 -
build/win32/vs10/cogl-install.props | 168 -----
build/win32/vs10/cogl-install.vcxproj | 217 -------
build/win32/vs10/cogl-msaa.vcxproj | 169 -----
build/win32/vs10/cogl-msaa.vcxproj.filters | 14 -
build/win32/vs10/cogl-pango.vcxproj.filtersin | 19 -
build/win32/vs10/cogl-pango.vcxprojin | 210 -------
build/win32/vs10/cogl-path.vcxproj.filtersin | 25 -
build/win32/vs10/cogl-path.vcxprojin | 234 -------
build/win32/vs10/cogl-sdl2-hello.vcxproj | 173 -----
build/win32/vs10/cogl-sdl2-hello.vcxproj.filters | 14 -
build/win32/vs10/cogl-version-paths.props | 53 --
build/win32/vs10/cogl.sln | 174 -----
build/win32/vs10/cogl.vcxproj.filtersin | 41 --
build/win32/vs10/cogl.vcxprojin | 545 ----------------
.../vs10/test-conformance-cogl.vcxproj.filtersin | 13 -
build/win32/vs10/test-conformance-cogl.vcxprojin | 185 ------
build/win32/vs9/Makefile.am | 21 -
build/win32/vs9/README.txt | 95 ---
build/win32/vs9/cogl-build-defines.vsprops | 54 --
build/win32/vs9/cogl-crate.vcproj | 161 -----
build/win32/vs9/cogl-gen-srcs.vsprops | 102 ---
build/win32/vs9/cogl-hello.vcproj | 157 -----
build/win32/vs9/cogl-info.vcproj | 157 -----
build/win32/vs9/cogl-install.vcproj | 143 -----
build/win32/vs9/cogl-install.vsprops | 148 -----
build/win32/vs9/cogl-msaa.vcproj | 157 -----
build/win32/vs9/cogl-pango.vcprojin | 208 ------
build/win32/vs9/cogl-path.vcprojin | 267 --------
build/win32/vs9/cogl-sdl2-hello.vcproj | 161 -----
build/win32/vs9/cogl-version-paths.vsprops | 53 --
build/win32/vs9/cogl.sln | 208 ------
build/win32/vs9/cogl.vcprojin | 698 ---------------------
build/win32/vs9/test-conformance-cogl.vcprojin | 166 -----
cogl-pango/Makefile.am | 34 -
cogl-path/Makefile.am | 12 -
cogl/Makefile.am | 78 ---
configure.ac | 3 -
tests/conform/Makefile.am | 37 --
62 files changed, 11 insertions(+), 6282 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 25c354b0..062abb8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,6 @@ compile
stamp-enum-types
stamp-marshal
/build/autotools/*.m4
-/build/win32/*.bat
!/build/autotools/acglib.m4
!/build/autotools/introspection.m4
!/build/autotools/as-glibconfig.m4
diff --git a/build/Makefile.am b/build/Makefile.am
index 35909bb3..0f81afe3 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -1 +1 @@
-SUBDIRS = win32 nmake
+SUBDIRS = win32
diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
index b764e59e..628de83a 100644
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -1,3 +1,10 @@
-SUBDIRS = vs9 vs10
-
-EXTRA_DIST = *.bat
+EXTRA_DIST = \
+ build-rules-msvc.mak \
+ config-msvc.mak \
+ create-lists-msvc.mak \
+ create-lists.bat \
+ detectenv-msvc.mak \
+ generate-msvc.mak \
+ info-msvc.mak \
+ install.mak \
+ Makefile.vc
diff --git a/build/nmake/Makefile.vc b/build/win32/Makefile.vc
similarity index 100%
rename from build/nmake/Makefile.vc
rename to build/win32/Makefile.vc
diff --git a/build/nmake/build-rules-msvc.mak b/build/win32/build-rules-msvc.mak
similarity index 100%
rename from build/nmake/build-rules-msvc.mak
rename to build/win32/build-rules-msvc.mak
diff --git a/build/nmake/config-msvc.mak b/build/win32/config-msvc.mak
similarity index 100%
rename from build/nmake/config-msvc.mak
rename to build/win32/config-msvc.mak
diff --git a/build/nmake/create-lists-msvc.mak b/build/win32/create-lists-msvc.mak
similarity index 100%
rename from build/nmake/create-lists-msvc.mak
rename to build/win32/create-lists-msvc.mak
diff --git a/build/nmake/create-lists.bat b/build/win32/create-lists.bat
similarity index 100%
rename from build/nmake/create-lists.bat
rename to build/win32/create-lists.bat
diff --git a/build/nmake/detectenv-msvc.mak b/build/win32/detectenv-msvc.mak
similarity index 100%
rename from build/nmake/detectenv-msvc.mak
rename to build/win32/detectenv-msvc.mak
diff --git a/build/nmake/generate-msvc.mak b/build/win32/generate-msvc.mak
similarity index 100%
rename from build/nmake/generate-msvc.mak
rename to build/win32/generate-msvc.mak
diff --git a/build/nmake/info-msvc.mak b/build/win32/info-msvc.mak
similarity index 100%
rename from build/nmake/info-msvc.mak
rename to build/win32/info-msvc.mak
diff --git a/build/nmake/install.mak b/build/win32/install.mak
similarity index 100%
rename from build/nmake/install.mak
rename to build/win32/install.mak
diff --git a/cogl-pango/Makefile.am b/cogl-pango/Makefile.am
index d9e55130..e87fadf7 100644
--- a/cogl-pango/Makefile.am
+++ b/cogl-pango/Makefile.am
@@ -42,42 +42,8 @@ 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_pango_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_pango_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_pango_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.rc.in cogl-pango.rc
-DISTCLEANFILES += ../build/win32/vs9/cogl-pango.vcproj ../build/win32/vs10/cogl-pango.vcxproj
../build/win32/vs10/cogl-pango.vcxproj.filters cogl-pango.rc
-
-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
diff --git a/cogl-path/Makefile.am b/cogl-path/Makefile.am
index 57d5e233..b905d1b6 100644
--- a/cogl-path/Makefile.am
+++ b/cogl-path/Makefile.am
@@ -62,15 +62,3 @@ pkgconfig_DATA = $(pc_files)
EXTRA_DIST += cogl-path.pc.in
DISTCLEANFILES += $(pc_files)
-
-dist-hook: \
- $(top_builddir)/build/win32/vs9/cogl-path.vcproj \
- $(top_builddir)/build/win32/vs10/cogl-path.vcxproj \
- $(top_builddir)/build/win32/vs10/cogl-path.vcxproj.filters
-
-MSVC_PROJECT = cogl-path
-MSVC_PROJECT_SRCDIR = cogl-path
-MSVC_PROJECT_SRCS = $(source_path_c)
-MSVC_PROJECT_EXCLUDES = dummy
-
-include $(top_srcdir)/build/Makefile-msvcproj.mak
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index fd515a2f..002b1299 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -212,82 +212,6 @@ nodist_coglinclude_HEADERS = $(cogl_nodist_experimental_h) cogl-defines.h cogl-e
cogl_proto_includedir = $(includedir)/cogl/cogl/gl-prototypes
cogl_proto_include_HEADERS = $(cogl_gl_prototypes_h)
-dist-hook: ../build/win32/vs9/cogl.vcproj ../build/win32/vs10/cogl.vcxproj
../build/win32/vs10/cogl.vcxproj.filters ../build/win32/gen-enums.bat
-
-# 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|*-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; \
- 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|*-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; \
- 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|*-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; \
- done >cogl.vs10.sourcefiles.filters
- $(CPP) -P - <$(top_srcdir)/build/win32/vs10/cogl.vcxproj.filtersin >$@
- rm cogl.vs10.sourcefiles.filters
-
-cogl.vsenums_h:
- echo 'perl %1\bin\glib-mkenums --template ../../cogl/cogl-enum-types.h.in ' >vsenums_h.temp1
- for F in `echo $(cogl_1_public_h) $(srcdir)/cogl-win32-renderer.h`; do \
- case $$F in \
- *xlib*.h|*wayland*.h) ;; \
- *.h) echo '../../cogl'$$F' ' \
- ;; \
- esac; \
- done >>vsenums_h.temp1
- cat vsenums_h.temp1 | sed 's_/cogl./_/cogl/_' >vsenums_h.temp
- cat vsenums_h.temp | tr -d '\n' >>$@
- echo '> ..\..\cogl\cogl-enum-types.h' >>$@
- rm vsenums_h.temp1
- rm vsenums_h.temp
-
-cogl.vsenums_c:
- echo 'perl %1\bin\glib-mkenums --template ../../cogl/cogl-enum-types.c.in ' >vsenums_c.temp1
- for F in `echo $(cogl_1_public_h) $(srcdir)/cogl-win32-renderer.h`; do \
- case $$F in \
- *xlib*.h|*wayland*.h) ;; \
- *.h) echo '../../cogl'$$F' ' \
- ;; \
- esac; \
- done >>vsenums_c.temp1
- cat vsenums_c.temp1 | sed 's_/cogl./_/cogl/_' >vsenums_c.temp
- cat vsenums_c.temp | tr -d '\n' >>$@
- echo '> ..\..\cogl\cogl-enum-types.c' >>$@
- rm vsenums_c.temp1
- rm vsenums_c.temp
-
-../build/win32/gen-enums.bat: cogl.vsenums_h cogl.vsenums_c
- echo 'if exist ..\..\cogl\cogl-enum-types.h goto DONE_COGL_ENUMS_H' >$@
- cat cogl.vsenums_h >>$@
- echo ':DONE_COGL_ENUMS_H' >>$@
- echo 'if exist ..\..\cogl\cogl-enum-types.c goto DONE_COGL_ENUMS_C' >>$@
- cat cogl.vsenums_c >>$@
- echo ':DONE_COGL_ENUMS_C' >>$@
- rm cogl.vsenums_h
- rm cogl.vsenums_c
-
EXTRA_DIST += \
cogl-defines.h.win32.in \
cogl-defines.h.win32 \
@@ -298,8 +222,6 @@ EXTRA_DIST += \
cogl.rc.in \
cogl.rc
-DISTCLEANFILES += ../build/win32/vs9/cogl.vcproj ../build/win32/vs10/cogl.vcxproj
../build/win32/vs10/cogl.vcxproj.filters ../build/win32/gen-enums.bat cogl.rc
-
-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
diff --git a/configure.ac b/configure.ac
index ac7f8854..d49f6340 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1490,10 +1490,7 @@ Makefile
README
config.h.win32
build/Makefile
-build/nmake/Makefile
build/win32/Makefile
-build/win32/vs9/Makefile
-build/win32/vs10/Makefile
deps/Makefile
deps/glib/Makefile
deps/gmodule/Makefile
diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
index 211379ff..992f9a4e 100644
--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@@ -101,43 +101,6 @@ TEST_PROGS = test-conformance
DISTCLEANFILES = .gitignore
-dist-hook: ../../build/win32/vs9/test-conformance-cogl.vcproj
../../build/win32/vs10/test-conformance-cogl.vcxproj
../../build/win32/vs10/test-conformance-cogl.vcxproj.filters
-
-../../build/win32/vs9/test-conformance-cogl.vcproj:
$(top_srcdir)/build/win32/vs9/test-conformance-cogl.vcprojin
- for F in $(test_conformance_SOURCES); do \
- case $$F in \
- *.c) echo ' <File RelativePath="..\..\..\tests\conform\'$$F'" />' \
- ;; \
- esac; \
- done >testconformance.sourcefiles
- $(CPP) -P - <$(top_srcdir)/build/win32/vs9/test-conformance-cogl.vcprojin >$@
- rm testconformance.sourcefiles
-
-../../build/win32/vs10/test-conformance-cogl.vcxproj:
$(top_srcdir)/build/win32/vs10/test-conformance-cogl.vcxprojin
- for F in $(test_conformance_SOURCES); do \
- case $$F in \
- *.c) echo ' <ClCompile Include="..\..\..\tests\conform\'$$F'" />' \
- ;; \
- esac; \
- done >testconformance.vs10.sourcefiles
- $(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-conformance-cogl.vcxprojin >$@
- rm testconformance.vs10.sourcefiles
-
-../../build/win32/vs10/test-conformance-cogl.vcxproj.filters:
$(top_srcdir)/build/win32/vs10/test-conformance-cogl.vcxproj.filtersin
- for F in $(test_conformance_SOURCES); do \
- case $$F in \
- *.c) echo ' <ClCompile
Include="..\..\..\tests\conform\'$$F'"><Filter>Sources</Filter></ClCompile>' \
- ;; \
- esac; \
- done >testconformance.vs10.sourcefiles.filters
- $(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-conformance-cogl.vcxproj.filtersin >$@
- rm testconformance.vs10.sourcefiles.filters
-
-# Let the VS9/VS10 Project files be cleared out before they are re-expanded...
-DISTCLEANFILES += ../../build/win32/vs9/test-conformance-cogl.vcproj \
- ../../build/win32/vs10/test-conformance-cogl.vcxproj \
- ../../build/win32/vs10/test-conformance-cogl.vcxproj.filters
-
# we override the clean-generic target to clean up the wrappers so
# we cannot use CLEANFILES
clean-generic: clean-wrappers
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]