Skip to content

Commit a8b12f3

Browse files
author
Cristy
committed
update README
1 parent 8e6e5ca commit a8b12f3

File tree

2 files changed

+93
-93
lines changed

2 files changed

+93
-93
lines changed

‎Makefile

+92-92
Original file line numberDiff line numberDiff line change
@@ -721,10 +721,10 @@ AWK = gawk
721721
BIN_DIR = /usr/local/bin
722722
BZLIB_LIBS = -lbz2
723723
CC = gcc
724-
CCDEPMODE = depmode=none
724+
CCDEPMODE = depmode=gcc3
725725
CCMALLOCDelegate =
726-
CFLAGS = -DWITH_GZFILEOP -fopenmp -Wall -g -O2 -mtune=core2 -pthread -pthread
727-
CONFIGURE_ARGS = ./configure '--disable-dependency-tracking'
726+
CFLAGS = -DWITH_GZFILEOP -fopenmp -Wall -g -O2 -mtune=haswell -pthread -pthread
727+
CONFIGURE_ARGS = ./configure
728728
CONFIGURE_DEPENDENCIES = $(top_srcdir)/ChangeLog.md $(top_srcdir)/m4/version.m4
729729
CONFIGURE_PATH = /usr/local/etc/WizardsToolkit-1
730730
CPP = gcc -E
@@ -734,7 +734,7 @@ CTAGS = ctags
734734
CVS_BRANCH_TAG =
735735
CXX = g++
736736
CXXCPP = g++ -E
737-
CXXDEPMODE = depmode=none
737+
CXXDEPMODE = depmode=gcc3
738738
CXXFLAGS = -pthread -pthread
739739
CYGPATH_W = echo
740740
DATA_DIR = /usr/local/share
@@ -869,7 +869,7 @@ UINTPTR_F = "l"
869869
UINTPTR_T = unsigned long
870870
UMEM_LIBS =
871871
VERSION = 1.0.9-5
872-
WIZARD_CFLAGS = -DWITH_GZFILEOP -fopenmp -Wall -g -O2 -mtune=core2 -pthread -pthread
872+
WIZARD_CFLAGS = -DWITH_GZFILEOP -fopenmp -Wall -g -O2 -mtune=haswell -pthread -pthread
873873
WIZARD_CONFIGURE_BUILD_PATH = /home/cristy/WizardsToolkit-1.0.9/config
874874
WIZARD_CONFIGURE_SRC_PATH = /home/cristy/WizardsToolkit-1.0.9/config
875875
WIZARD_CPPFLAGS = -I/usr/local/include/WizardsToolkit-1
@@ -1852,65 +1852,65 @@ mostlyclean-compile:
18521852
distclean-compile:
18531853
-rm -f *.tab.c
18541854

1855-
#include tests/$(DEPDIR)/validate-validate.Po # am--include-marker
1856-
#include utilities/$(DEPDIR)/cipher-info.Po # am--include-marker
1857-
#include utilities/$(DEPDIR)/content.Po # am--include-marker
1858-
#include utilities/$(DEPDIR)/decipher.Po # am--include-marker
1859-
#include utilities/$(DEPDIR)/digest.Po # am--include-marker
1860-
#include utilities/$(DEPDIR)/encipher.Po # am--include-marker
1861-
#include utilities/$(DEPDIR)/keyring.Po # am--include-marker
1862-
#include utilities/$(DEPDIR)/utility.Po # am--include-marker
1863-
#include wizard/$(DEPDIR)/aes.Plo # am--include-marker
1864-
#include wizard/$(DEPDIR)/authenticate.Plo # am--include-marker
1865-
#include wizard/$(DEPDIR)/blob.Plo # am--include-marker
1866-
#include wizard/$(DEPDIR)/bzip.Plo # am--include-marker
1867-
#include wizard/$(DEPDIR)/chacha.Plo # am--include-marker
1868-
#include wizard/$(DEPDIR)/cipher.Plo # am--include-marker
1869-
#include wizard/$(DEPDIR)/client.Plo # am--include-marker
1870-
#include wizard/$(DEPDIR)/configure.Plo # am--include-marker
1871-
#include wizard/$(DEPDIR)/crc64.Plo # am--include-marker
1872-
#include wizard/$(DEPDIR)/entropy.Plo # am--include-marker
1873-
#include wizard/$(DEPDIR)/exception.Plo # am--include-marker
1874-
#include wizard/$(DEPDIR)/file.Plo # am--include-marker
1875-
#include wizard/$(DEPDIR)/hash.Plo # am--include-marker
1876-
#include wizard/$(DEPDIR)/hashmap.Plo # am--include-marker
1877-
#include wizard/$(DEPDIR)/hmac.Plo # am--include-marker
1878-
#include wizard/$(DEPDIR)/key.Plo # am--include-marker
1879-
#include wizard/$(DEPDIR)/keyring.Plo # am--include-marker
1880-
#include wizard/$(DEPDIR)/locale.Plo # am--include-marker
1881-
#include wizard/$(DEPDIR)/log.Plo # am--include-marker
1882-
#include wizard/$(DEPDIR)/lzma.Plo # am--include-marker
1883-
#include wizard/$(DEPDIR)/magick.Plo # am--include-marker
1884-
#include wizard/$(DEPDIR)/md5.Plo # am--include-marker
1885-
#include wizard/$(DEPDIR)/memory.Plo # am--include-marker
1886-
#include wizard/$(DEPDIR)/mime.Plo # am--include-marker
1887-
#include wizard/$(DEPDIR)/nt-base.Plo # am--include-marker
1888-
#include wizard/$(DEPDIR)/option.Plo # am--include-marker
1889-
#include wizard/$(DEPDIR)/passphrase.Plo # am--include-marker
1890-
#include wizard/$(DEPDIR)/random.Plo # am--include-marker
1891-
#include wizard/$(DEPDIR)/resource.Plo # am--include-marker
1892-
#include wizard/$(DEPDIR)/sanitize.Plo # am--include-marker
1893-
#include wizard/$(DEPDIR)/secret.Plo # am--include-marker
1894-
#include wizard/$(DEPDIR)/semaphore.Plo # am--include-marker
1895-
#include wizard/$(DEPDIR)/serpent.Plo # am--include-marker
1896-
#include wizard/$(DEPDIR)/sha1.Plo # am--include-marker
1897-
#include wizard/$(DEPDIR)/sha2224.Plo # am--include-marker
1898-
#include wizard/$(DEPDIR)/sha2256.Plo # am--include-marker
1899-
#include wizard/$(DEPDIR)/sha2384.Plo # am--include-marker
1900-
#include wizard/$(DEPDIR)/sha2512.Plo # am--include-marker
1901-
#include wizard/$(DEPDIR)/sha3.Plo # am--include-marker
1902-
#include wizard/$(DEPDIR)/signature.Plo # am--include-marker
1903-
#include wizard/$(DEPDIR)/splay-tree.Plo # am--include-marker
1904-
#include wizard/$(DEPDIR)/string.Plo # am--include-marker
1905-
#include wizard/$(DEPDIR)/thread.Plo # am--include-marker
1906-
#include wizard/$(DEPDIR)/timer.Plo # am--include-marker
1907-
#include wizard/$(DEPDIR)/token.Plo # am--include-marker
1908-
#include wizard/$(DEPDIR)/twofish.Plo # am--include-marker
1909-
#include wizard/$(DEPDIR)/utility.Plo # am--include-marker
1910-
#include wizard/$(DEPDIR)/version.Plo # am--include-marker
1911-
#include wizard/$(DEPDIR)/wizard.Plo # am--include-marker
1912-
#include wizard/$(DEPDIR)/xml-tree.Plo # am--include-marker
1913-
#include wizard/$(DEPDIR)/zip.Plo # am--include-marker
1855+
include tests/$(DEPDIR)/validate-validate.Po # am--include-marker
1856+
include utilities/$(DEPDIR)/cipher-info.Po # am--include-marker
1857+
include utilities/$(DEPDIR)/content.Po # am--include-marker
1858+
include utilities/$(DEPDIR)/decipher.Po # am--include-marker
1859+
include utilities/$(DEPDIR)/digest.Po # am--include-marker
1860+
include utilities/$(DEPDIR)/encipher.Po # am--include-marker
1861+
include utilities/$(DEPDIR)/keyring.Po # am--include-marker
1862+
include utilities/$(DEPDIR)/utility.Po # am--include-marker
1863+
include wizard/$(DEPDIR)/aes.Plo # am--include-marker
1864+
include wizard/$(DEPDIR)/authenticate.Plo # am--include-marker
1865+
include wizard/$(DEPDIR)/blob.Plo # am--include-marker
1866+
include wizard/$(DEPDIR)/bzip.Plo # am--include-marker
1867+
include wizard/$(DEPDIR)/chacha.Plo # am--include-marker
1868+
include wizard/$(DEPDIR)/cipher.Plo # am--include-marker
1869+
include wizard/$(DEPDIR)/client.Plo # am--include-marker
1870+
include wizard/$(DEPDIR)/configure.Plo # am--include-marker
1871+
include wizard/$(DEPDIR)/crc64.Plo # am--include-marker
1872+
include wizard/$(DEPDIR)/entropy.Plo # am--include-marker
1873+
include wizard/$(DEPDIR)/exception.Plo # am--include-marker
1874+
include wizard/$(DEPDIR)/file.Plo # am--include-marker
1875+
include wizard/$(DEPDIR)/hash.Plo # am--include-marker
1876+
include wizard/$(DEPDIR)/hashmap.Plo # am--include-marker
1877+
include wizard/$(DEPDIR)/hmac.Plo # am--include-marker
1878+
include wizard/$(DEPDIR)/key.Plo # am--include-marker
1879+
include wizard/$(DEPDIR)/keyring.Plo # am--include-marker
1880+
include wizard/$(DEPDIR)/locale.Plo # am--include-marker
1881+
include wizard/$(DEPDIR)/log.Plo # am--include-marker
1882+
include wizard/$(DEPDIR)/lzma.Plo # am--include-marker
1883+
include wizard/$(DEPDIR)/magick.Plo # am--include-marker
1884+
include wizard/$(DEPDIR)/md5.Plo # am--include-marker
1885+
include wizard/$(DEPDIR)/memory.Plo # am--include-marker
1886+
include wizard/$(DEPDIR)/mime.Plo # am--include-marker
1887+
include wizard/$(DEPDIR)/nt-base.Plo # am--include-marker
1888+
include wizard/$(DEPDIR)/option.Plo # am--include-marker
1889+
include wizard/$(DEPDIR)/passphrase.Plo # am--include-marker
1890+
include wizard/$(DEPDIR)/random.Plo # am--include-marker
1891+
include wizard/$(DEPDIR)/resource.Plo # am--include-marker
1892+
include wizard/$(DEPDIR)/sanitize.Plo # am--include-marker
1893+
include wizard/$(DEPDIR)/secret.Plo # am--include-marker
1894+
include wizard/$(DEPDIR)/semaphore.Plo # am--include-marker
1895+
include wizard/$(DEPDIR)/serpent.Plo # am--include-marker
1896+
include wizard/$(DEPDIR)/sha1.Plo # am--include-marker
1897+
include wizard/$(DEPDIR)/sha2224.Plo # am--include-marker
1898+
include wizard/$(DEPDIR)/sha2256.Plo # am--include-marker
1899+
include wizard/$(DEPDIR)/sha2384.Plo # am--include-marker
1900+
include wizard/$(DEPDIR)/sha2512.Plo # am--include-marker
1901+
include wizard/$(DEPDIR)/sha3.Plo # am--include-marker
1902+
include wizard/$(DEPDIR)/signature.Plo # am--include-marker
1903+
include wizard/$(DEPDIR)/splay-tree.Plo # am--include-marker
1904+
include wizard/$(DEPDIR)/string.Plo # am--include-marker
1905+
include wizard/$(DEPDIR)/thread.Plo # am--include-marker
1906+
include wizard/$(DEPDIR)/timer.Plo # am--include-marker
1907+
include wizard/$(DEPDIR)/token.Plo # am--include-marker
1908+
include wizard/$(DEPDIR)/twofish.Plo # am--include-marker
1909+
include wizard/$(DEPDIR)/utility.Plo # am--include-marker
1910+
include wizard/$(DEPDIR)/version.Plo # am--include-marker
1911+
include wizard/$(DEPDIR)/wizard.Plo # am--include-marker
1912+
include wizard/$(DEPDIR)/xml-tree.Plo # am--include-marker
1913+
include wizard/$(DEPDIR)/zip.Plo # am--include-marker
19141914

19151915
$(am__depfiles_remade):
19161916
@$(MKDIR_P) $(@D)
@@ -1919,42 +1919,42 @@ $(am__depfiles_remade):
19191919
am--depfiles: $(am__depfiles_remade)
19201920

19211921
.c.o:
1922-
# $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
1923-
# $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
1924-
# $(am__mv) $$depbase.Tpo $$depbase.Po
1925-
# $(AM_V_CC)source='$<' object='$@' libtool=no
1926-
# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp)
1927-
$(AM_V_CC)$(COMPILE) -c -o $@ $<
1922+
$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
1923+
$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
1924+
$(am__mv) $$depbase.Tpo $$depbase.Po
1925+
# $(AM_V_CC)source='$<' object='$@' libtool=no \
1926+
# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
1927+
# $(AM_V_CC_no)$(COMPILE) -c -o $@ $<
19281928

19291929
.c.obj:
1930-
# $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
1931-
# $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
1932-
# $(am__mv) $$depbase.Tpo $$depbase.Po
1933-
# $(AM_V_CC)source='$<' object='$@' libtool=no
1934-
# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp)
1935-
$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
1930+
$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
1931+
$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
1932+
$(am__mv) $$depbase.Tpo $$depbase.Po
1933+
# $(AM_V_CC)source='$<' object='$@' libtool=no \
1934+
# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
1935+
# $(AM_V_CC_no)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
19361936

19371937
.c.lo:
1938-
# $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
1939-
# $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
1940-
# $(am__mv) $$depbase.Tpo $$depbase.Plo
1941-
# $(AM_V_CC)source='$<' object='$@' libtool=yes
1942-
# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp)
1943-
$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
1938+
$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
1939+
$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
1940+
$(am__mv) $$depbase.Tpo $$depbase.Plo
1941+
# $(AM_V_CC)source='$<' object='$@' libtool=yes \
1942+
# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
1943+
# $(AM_V_CC_no)$(LTCOMPILE) -c -o $@ $<
19441944

19451945
tests/validate-validate.o: tests/validate.c
1946-
# $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_validate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/validate-validate.o -MD -MP -MF tests/$(DEPDIR)/validate-validate.Tpo -c -o tests/validate-validate.o `test -f 'tests/validate.c' || echo '$(srcdir)/'`tests/validate.c
1947-
# $(AM_V_at)$(am__mv) tests/$(DEPDIR)/validate-validate.Tpo tests/$(DEPDIR)/validate-validate.Po
1948-
# $(AM_V_CC)source='tests/validate.c' object='tests/validate-validate.o' libtool=no
1949-
# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp)
1950-
$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_validate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/validate-validate.o `test -f 'tests/validate.c' || echo '$(srcdir)/'`tests/validate.c
1946+
$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_validate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/validate-validate.o -MD -MP -MF tests/$(DEPDIR)/validate-validate.Tpo -c -o tests/validate-validate.o `test -f 'tests/validate.c' || echo '$(srcdir)/'`tests/validate.c
1947+
$(AM_V_at)$(am__mv) tests/$(DEPDIR)/validate-validate.Tpo tests/$(DEPDIR)/validate-validate.Po
1948+
# $(AM_V_CC)source='tests/validate.c' object='tests/validate-validate.o' libtool=no \
1949+
# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
1950+
# $(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_validate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/validate-validate.o `test -f 'tests/validate.c' || echo '$(srcdir)/'`tests/validate.c
19511951

19521952
tests/validate-validate.obj: tests/validate.c
1953-
# $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_validate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/validate-validate.obj -MD -MP -MF tests/$(DEPDIR)/validate-validate.Tpo -c -o tests/validate-validate.obj `if test -f 'tests/validate.c'; then $(CYGPATH_W) 'tests/validate.c'; else $(CYGPATH_W) '$(srcdir)/tests/validate.c'; fi`
1954-
# $(AM_V_at)$(am__mv) tests/$(DEPDIR)/validate-validate.Tpo tests/$(DEPDIR)/validate-validate.Po
1955-
# $(AM_V_CC)source='tests/validate.c' object='tests/validate-validate.obj' libtool=no
1956-
# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp)
1957-
$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_validate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/validate-validate.obj `if test -f 'tests/validate.c'; then $(CYGPATH_W) 'tests/validate.c'; else $(CYGPATH_W) '$(srcdir)/tests/validate.c'; fi`
1953+
$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_validate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/validate-validate.obj -MD -MP -MF tests/$(DEPDIR)/validate-validate.Tpo -c -o tests/validate-validate.obj `if test -f 'tests/validate.c'; then $(CYGPATH_W) 'tests/validate.c'; else $(CYGPATH_W) '$(srcdir)/tests/validate.c'; fi`
1954+
$(AM_V_at)$(am__mv) tests/$(DEPDIR)/validate-validate.Tpo tests/$(DEPDIR)/validate-validate.Po
1955+
# $(AM_V_CC)source='tests/validate.c' object='tests/validate-validate.obj' libtool=no \
1956+
# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
1957+
# $(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_validate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/validate-validate.obj `if test -f 'tests/validate.c'; then $(CYGPATH_W) 'tests/validate.c'; else $(CYGPATH_W) '$(srcdir)/tests/validate.c'; fi`
19581958

19591959
mostlyclean-libtool:
19601960
-rm -f *.lo

‎README.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Wizard's Toolkit is free software delivered as a ready-to-run binary distributio
66

77
The current release is Wizard's Toolkit 1.0.9-4. It runs on Linux, Windows, Mac Os X, iOS, Android OS, and others.
88

9-
The authoritative Wizard's Toolkit web site is https://urban-warrior.org. The authoritative source code repository is https://github.com/ImageMagick/WizardsToolkit.
9+
The authoritative Wizard's Toolkit web site is https://magick.imagemagick.org. The authoritative source code repository is https://github.com/ImageMagick/WizardsToolkit.
1010

1111
Features and Capabilities
1212

0 commit comments

Comments
 (0)