From f9840e345876d860bc8f5c771de7f63af52cf284 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Mon, 9 Dec 2013 13:10:31 +0000 Subject: [PATCH] lolremez: move LolRemez out of the engine, it's really too specific. --- .gitignore | 1 - configure.ac | 3 +++ src/Makefile.am | 2 +- test/math/Makefile.am | 8 +------- tools/Makefile.am | 1 + tools/lolremez/.gitignore | 2 ++ tools/lolremez/Makefile.am | 11 +++++++++++ {test/math => tools/lolremez}/NEWS.txt | 0 test/math/remez.cpp => tools/lolremez/lolremez.cpp | 3 ++- src/lol/math/remez.h => tools/lolremez/lolremez.h | 0 {test/math => tools/lolremez}/lolremez.sln | 2 +- .../remez.vcxproj => tools/lolremez/lolremez.vcxproj | 6 +++--- .../lolremez/lolremez.vcxproj.filters | 8 +++----- 13 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 tools/lolremez/.gitignore create mode 100644 tools/lolremez/Makefile.am rename {test/math => tools/lolremez}/NEWS.txt (100%) rename test/math/remez.cpp => tools/lolremez/lolremez.cpp (96%) rename src/lol/math/remez.h => tools/lolremez/lolremez.h (100%) rename {test/math => tools/lolremez}/lolremez.sln (91%) rename test/math/remez.vcxproj => tools/lolremez/lolremez.vcxproj (98%) rename test/math/remez.vcxproj.filters => tools/lolremez/lolremez.vcxproj.filters (86%) diff --git a/.gitignore b/.gitignore index dc3369dd..2e526a99 100644 --- a/.gitignore +++ b/.gitignore @@ -84,7 +84,6 @@ test/testsuite test/sandbox/sample test/math/pi test/math/poly -test/math/remez test/xolotl/xolotl tools/make-font demos/lol.js/lol.js diff --git a/configure.ac b/configure.ac index 72253fda..ef6885d1 100644 --- a/configure.ac +++ b/configure.ac @@ -538,6 +538,9 @@ AC_CONFIG_FILES( [demos/tutorial/Makefile demos/lol.js/Makefile ]) +AC_CONFIG_FILES( + [tools/lolremez/Makefile +]) AC_CONFIG_FILES( [tools/neercs/Makefile ]) diff --git a/src/Makefile.am b/src/Makefile.am index c03c90df..9d80c1a1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -38,7 +38,7 @@ liblolcore_headers = \ \ lol/math/all.h \ lol/math/functions.h lol/math/vector.h lol/math/half.h lol/math/real.h \ - lol/math/remez.h lol/math/geometry.h lol/math/interp.h lol/math/rand.h \ + lol/math/geometry.h lol/math/interp.h lol/math/rand.h \ lol/math/constants.h \ \ lol/sys/all.h \ diff --git a/test/math/Makefile.am b/test/math/Makefile.am index 7e3dafca..65d88a2f 100644 --- a/test/math/Makefile.am +++ b/test/math/Makefile.am @@ -1,9 +1,7 @@ include $(top_srcdir)/build/autotools/common.am -EXTRA_DIST += NEWS.txt lolremez.sln remez.vcxproj remez.vcxproj.filters - -noinst_PROGRAMS = pi poly remez +noinst_PROGRAMS = pi poly pi_SOURCES = pi.cpp pi_CPPFLAGS = $(AM_CPPFLAGS) @@ -13,7 +11,3 @@ poly_SOURCES = poly.cpp poly_CPPFLAGS = $(AM_CPPFLAGS) poly_DEPENDENCIES = @LOL_DEPS@ -remez_SOURCES = remez.cpp -remez_CPPFLAGS = $(AM_CPPFLAGS) -remez_DEPENDENCIES = @LOL_DEPS@ - diff --git a/tools/Makefile.am b/tools/Makefile.am index 3aa7b638..45e93953 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -2,6 +2,7 @@ include $(top_srcdir)/build/autotools/common.am SUBDIRS = +SUBDIRS += lolremez SUBDIRS += neercs SUBDIRS += vimlol SUBDIRS += vslol diff --git a/tools/lolremez/.gitignore b/tools/lolremez/.gitignore new file mode 100644 index 00000000..cabca74d --- /dev/null +++ b/tools/lolremez/.gitignore @@ -0,0 +1,2 @@ +# Our binaries +lolremez diff --git a/tools/lolremez/Makefile.am b/tools/lolremez/Makefile.am new file mode 100644 index 00000000..bba1426d --- /dev/null +++ b/tools/lolremez/Makefile.am @@ -0,0 +1,11 @@ + +include $(top_srcdir)/build/autotools/common.am + +EXTRA_DIST += NEWS.txt lolremez.sln remez.vcxproj remez.vcxproj.filters + +noinst_PROGRAMS = lolremez + +lolremez_SOURCES = lolremez.cpp +lolremez_CPPFLAGS = $(AM_CPPFLAGS) +lolremez_DEPENDENCIES = @LOL_DEPS@ + diff --git a/test/math/NEWS.txt b/tools/lolremez/NEWS.txt similarity index 100% rename from test/math/NEWS.txt rename to tools/lolremez/NEWS.txt diff --git a/test/math/remez.cpp b/tools/lolremez/lolremez.cpp similarity index 96% rename from test/math/remez.cpp rename to tools/lolremez/lolremez.cpp index 8fd3b74b..f4916a48 100644 --- a/test/math/remez.cpp +++ b/tools/lolremez/lolremez.cpp @@ -15,7 +15,8 @@ #include "core.h" #include -#include + +#include "lolremez.h" using lol::real; using lol::RemezSolver; diff --git a/src/lol/math/remez.h b/tools/lolremez/lolremez.h similarity index 100% rename from src/lol/math/remez.h rename to tools/lolremez/lolremez.h diff --git a/test/math/lolremez.sln b/tools/lolremez/lolremez.sln similarity index 91% rename from test/math/lolremez.sln rename to tools/lolremez/lolremez.sln index 599add26..ba6b3637 100644 --- a/test/math/lolremez.sln +++ b/tools/lolremez/lolremez.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remez", "remez.vcxproj", "{A2767731-6FBF-442C-900F-301D095516E7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lolremez", "lolremez.vcxproj", "{A2767731-6FBF-442C-900F-301D095516E7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{663F5D32-D212-4A88-A681-84B54D3188A3}" ProjectSection(SolutionItems) = preProject diff --git a/test/math/remez.vcxproj b/tools/lolremez/lolremez.vcxproj similarity index 98% rename from test/math/remez.vcxproj rename to tools/lolremez/lolremez.vcxproj index 49d80887..4b03fba9 100644 --- a/test/math/remez.vcxproj +++ b/tools/lolremez/lolremez.vcxproj @@ -21,7 +21,7 @@ {A2767731-6FBF-442C-900F-301D095516E7} Win32Proj - remez + lolremez @@ -138,12 +138,12 @@ - + - + diff --git a/test/math/remez.vcxproj.filters b/tools/lolremez/lolremez.vcxproj.filters similarity index 86% rename from test/math/remez.vcxproj.filters rename to tools/lolremez/lolremez.vcxproj.filters index 1af97461..1fcabda8 100644 --- a/test/math/remez.vcxproj.filters +++ b/tools/lolremez/lolremez.vcxproj.filters @@ -12,7 +12,7 @@ - + @@ -21,8 +21,6 @@ lol\math - - lol\math - + - \ No newline at end of file +