<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, Sep 23, 2013 at 12:14 PM, Derek Buitenhuis <span dir="ltr"><<a href="mailto:derek.buitenhuis@gmail.com" target="_blank">derek.buitenhuis@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Nuke the useless build scripts which are only variations<br>
on:<br>
<br>
cmake ../../source<br>
ccmake ../../source (On Linux)<br>
<br>
and only call standard, well-known tools like MSBuild, make,<br>
and nmake (which is deprecated).<br></blockquote><div><br></div><div><br></div><div>I could sign-off on this *if* the various MSVC, Xcode, and ICL invocations were recorded in the README. Some of them take a non-trivial amount of effort to figure out</div>
<div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Signed-off-by: Derek Buitenhuis <<a href="mailto:derek.buitenhuis@gmail.com">derek.buitenhuis@gmail.com</a>><br>
---<br>
build/README.txt => README | 15 +++------------<br>
build/icl32/build-all.bat | 14 --------------<br>
build/icl32/make-makefile.bat | 15 ---------------<br>
build/icl64/build-all.bat | 14 --------------<br>
build/icl64/make-makefile.bat | 17 -----------------<br>
build/linux/make-Makefiles.bash | 3 ---<br>
build/msys/make-Makefiles.sh | 3 ---<br>
build/vc10-x86/build-all.bat | 14 --------------<br>
build/vc10-x86/make-solutions.bat | 6 ------<br>
build/vc10-x86_64/build-all.bat | 14 --------------<br>
build/vc10-x86_64/make-solutions.bat | 6 ------<br>
build/vc11-x86/build-all.bat | 14 --------------<br>
build/vc11-x86/make-solutions.bat | 6 ------<br>
build/vc11-x86_64/build-all.bat | 14 --------------<br>
build/vc11-x86_64/make-solutions.bat | 6 ------<br>
build/vc9-x86/build-all.bat | 14 --------------<br>
build/vc9-x86/make-solutions.bat | 6 ------<br>
build/vc9-x86_64/build-all.bat | 14 --------------<br>
build/vc9-x86_64/make-solutions.bat | 6 ------<br>
build/xcode/make-project.sh | 2 --<br>
.../01build-and-smoke-test.bat | 0<br>
{build/regression => regression}/02perftest.bat | 0<br>
.../regression => regression}/commandlines-example.txt | 0<br>
{build/regression => regression}/config-example.txt | 0<br>
{build/regression => regression}/email-csv.py | 0<br>
{build/regression => regression}/run.bat | 0<br>
26 files changed, 3 insertions(+), 200 deletions(-)<br>
rename build/README.txt => README (78%)<br>
delete mode 100644 build/icl32/build-all.bat<br>
delete mode 100644 build/icl32/make-makefile.bat<br>
delete mode 100644 build/icl64/build-all.bat<br>
delete mode 100644 build/icl64/make-makefile.bat<br>
delete mode 100755 build/linux/make-Makefiles.bash<br>
delete mode 100644 build/msys/make-Makefiles.sh<br>
delete mode 100644 build/vc10-x86/build-all.bat<br>
delete mode 100644 build/vc10-x86/make-solutions.bat<br>
delete mode 100644 build/vc10-x86_64/build-all.bat<br>
delete mode 100644 build/vc10-x86_64/make-solutions.bat<br>
delete mode 100644 build/vc11-x86/build-all.bat<br>
delete mode 100644 build/vc11-x86/make-solutions.bat<br>
delete mode 100644 build/vc11-x86_64/build-all.bat<br>
delete mode 100644 build/vc11-x86_64/make-solutions.bat<br>
delete mode 100644 build/vc9-x86/build-all.bat<br>
delete mode 100644 build/vc9-x86/make-solutions.bat<br>
delete mode 100644 build/vc9-x86_64/build-all.bat<br>
delete mode 100644 build/vc9-x86_64/make-solutions.bat<br>
delete mode 100755 build/xcode/make-project.sh<br>
rename {build/regression => regression}/01build-and-smoke-test.bat (100%)<br>
rename {build/regression => regression}/02perftest.bat (100%)<br>
rename {build/regression => regression}/commandlines-example.txt (100%)<br>
rename {build/regression => regression}/config-example.txt (100%)<br>
rename {build/regression => regression}/email-csv.py (100%)<br>
rename {build/regression => regression}/run.bat (100%)<br>
<br>
diff --git a/build/README.txt b/README<br>
similarity index 78%<br>
rename from build/README.txt<br>
rename to README<br>
index db50354..2c9b13a 100644<br>
--- a/build/README.txt<br>
+++ b/README<br>
@@ -42,23 +42,14 @@<br>
<br>
= Build Instructions Linux =<br>
<br>
-1. Use cmake to generate Makefiles: cmake ../source<br>
+1. Use cmake to generate Makefiles: cmake ../x265/source<br>
2. Build x265: make<br>
<br>
- Or use our shell script which runs cmake then opens the curses GUI to<br>
- configure build options<br>
-<br>
-1. cd build/linux ; ./make-Makefiles.bash<br>
-2. make<br>
-<br>
<br>
= Build Instructions Windows =<br>
<br>
-We recommend you use one of the make-solutions.bat files in the appropriate<br>
-build/ sub-folder for your preferred compiler. They will open the cmake-gui<br>
-to configure build options, click configure until no more red options remain,<br>
-then click generate and exit. There should now be an x265.sln file in the<br>
-same folder, open this in Visual Studio and build it.<br>
+Open cmake-gui and point it at the source directory, and select which<br>
+compiler and output type is required. Build as you would normally.<br>
<br>
= Version number considerations =<br>
<br>
diff --git a/build/icl32/build-all.bat b/build/icl32/build-all.bat<br>
deleted file mode 100644<br>
index cbe9a59..0000000<br>
diff --git a/build/icl32/make-makefile.bat b/build/icl32/make-makefile.bat<br>
deleted file mode 100644<br>
index 799344e..0000000<br>
diff --git a/build/icl64/build-all.bat b/build/icl64/build-all.bat<br>
deleted file mode 100644<br>
index d1d6b8d..0000000<br>
diff --git a/build/icl64/make-makefile.bat b/build/icl64/make-makefile.bat<br>
deleted file mode 100644<br>
index 2d3f629..0000000<br>
diff --git a/build/linux/make-Makefiles.bash b/build/linux/make-Makefiles.bash<br>
deleted file mode 100755<br>
index 4315d61..0000000<br>
diff --git a/build/msys/make-Makefiles.sh b/build/msys/make-Makefiles.sh<br>
deleted file mode 100644<br>
index 5387b5a..0000000<br>
diff --git a/build/vc10-x86/build-all.bat b/build/vc10-x86/build-all.bat<br>
deleted file mode 100644<br>
index 5a906e5..0000000<br>
diff --git a/build/vc10-x86/make-solutions.bat b/build/vc10-x86/make-solutions.bat<br>
deleted file mode 100644<br>
index 23c2c61..0000000<br>
diff --git a/build/vc10-x86_64/build-all.bat b/build/vc10-x86_64/build-all.bat<br>
deleted file mode 100644<br>
index 5a906e5..0000000<br>
diff --git a/build/vc10-x86_64/make-solutions.bat b/build/vc10-x86_64/make-solutions.bat<br>
deleted file mode 100644<br>
index 71afcc0..0000000<br>
diff --git a/build/vc11-x86/build-all.bat b/build/vc11-x86/build-all.bat<br>
deleted file mode 100644<br>
index 4445c03..0000000<br>
diff --git a/build/vc11-x86/make-solutions.bat b/build/vc11-x86/make-solutions.bat<br>
deleted file mode 100644<br>
index 0b9d049..0000000<br>
diff --git a/build/vc11-x86_64/build-all.bat b/build/vc11-x86_64/build-all.bat<br>
deleted file mode 100644<br>
index 4445c03..0000000<br>
diff --git a/build/vc11-x86_64/make-solutions.bat b/build/vc11-x86_64/make-solutions.bat<br>
deleted file mode 100644<br>
index d243bcd..0000000<br>
diff --git a/build/vc9-x86/build-all.bat b/build/vc9-x86/build-all.bat<br>
deleted file mode 100644<br>
index 8af8a4e..0000000<br>
diff --git a/build/vc9-x86/make-solutions.bat b/build/vc9-x86/make-solutions.bat<br>
deleted file mode 100644<br>
index 7a24aa3..0000000<br>
diff --git a/build/vc9-x86_64/build-all.bat b/build/vc9-x86_64/build-all.bat<br>
deleted file mode 100644<br>
index 8af8a4e..0000000<br>
diff --git a/build/vc9-x86_64/make-solutions.bat b/build/vc9-x86_64/make-solutions.bat<br>
deleted file mode 100644<br>
index 82a927e..0000000<br>
diff --git a/build/xcode/make-project.sh b/build/xcode/make-project.sh<br>
deleted file mode 100755<br>
index f4a4f7f..0000000<br>
diff --git a/build/regression/01build-and-smoke-test.bat b/regression/01build-and-smoke-test.bat<br>
similarity index 100%<br>
rename from build/regression/01build-and-smoke-test.bat<br>
rename to regression/01build-and-smoke-test.bat<br>
diff --git a/build/regression/02perftest.bat b/regression/02perftest.bat<br>
similarity index 100%<br>
rename from build/regression/02perftest.bat<br>
rename to regression/02perftest.bat<br>
diff --git a/build/regression/commandlines-example.txt b/regression/commandlines-example.txt<br>
similarity index 100%<br>
rename from build/regression/commandlines-example.txt<br>
rename to regression/commandlines-example.txt<br>
diff --git a/build/regression/config-example.txt b/regression/config-example.txt<br>
similarity index 100%<br>
rename from build/regression/config-example.txt<br>
rename to regression/config-example.txt<br>
diff --git a/build/regression/email-csv.py b/regression/email-csv.py<br>
similarity index 100%<br>
rename from build/regression/email-csv.py<br>
rename to regression/email-csv.py<br>
diff --git a/build/regression/run.bat b/regression/run.bat<br>
similarity index 100%<br>
rename from build/regression/run.bat<br>
rename to regression/run.bat<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.8.4<br>
<br>
_______________________________________________<br>
x265-devel mailing list<br>
<a href="mailto:x265-devel@videolan.org">x265-devel@videolan.org</a><br>
<a href="https://mailman.videolan.org/listinfo/x265-devel" target="_blank">https://mailman.videolan.org/listinfo/x265-devel</a><br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br>Steve Borho
</div></div>