summaryrefslogtreecommitdiff
path: root/Build/source/utils/asymptote/Makefile.in
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-10-11 21:35:51 +0000
committerKarl Berry <karl@freefriends.org>2019-10-11 21:35:51 +0000
commitbb3c09cc69221c47daba9c11dc3df8be2c66b465 (patch)
tree81536069fd3f879ad242ca8041920caec2ebcb95 /Build/source/utils/asymptote/Makefile.in
parent253f0f12cb645ea1458b36bd24f863e67406f688 (diff)
asy 2.58
1.00 sources git-svn-id: svn://tug.org/texlive/trunk@52346 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/asymptote/Makefile.in')
-rw-r--r--Build/source/utils/asymptote/Makefile.in14
1 files changed, 10 insertions, 4 deletions
diff --git a/Build/source/utils/asymptote/Makefile.in b/Build/source/utils/asymptote/Makefile.in
index 4255146c893..68bec17d4f3 100644
--- a/Build/source/utils/asymptote/Makefile.in
+++ b/Build/source/utils/asymptote/Makefile.in
@@ -3,6 +3,7 @@
ARCH = unix
POLL = poll
+ASYGLVERSION = @ASYGLVERSION@
GCVERSION = @GCVERSION@
GC = gc-$(GCVERSION)
LIBATOMIC = libatomic_ops-@ATOMICVERSION@
@@ -11,7 +12,7 @@ GCLIB = @GCLIB@
GCPPLIB = @GCPPLIB@
GCLIBS = $(GCPPLIB) $(GCLIB)
LFLAGS = @LDFLAGS@
-LIBS = $(LFLAGS) @PTHREAD_LIBS@ @LIBS@ $(GCLIBS)
+LIBS = $(LFLAGS) @PTHREAD_LIBS@ @GLEW@ @LIBS@ $(GCLIBS)
DOSLIBS = $(subst -lncurses, -ltermcap, $(LIBS)) -lgdi32 -lwinmm -s -static
PERL = perl
@@ -69,7 +70,7 @@ ASY = ./asy -dir base -config "" -render=0
DEFS = @DEFS@ @OPTIONS@ @PTHREAD_CFLAGS@ -DFFTWPP_SINGLE_THREAD
CFLAGS = @CFLAGS@
OPTS = $(DEFS) @CPPFLAGS@ @CXXFLAGS@ $(CFLAGS)
-GLEWOPTS = $(DEFS) @CPPFLAGS@ $(CFLAGS) -DGLEW_NO_GLU -DGLEW_BUILD -O1
+GLEWOPTS = $(DEFS) @CPPFLAGS@ $(CFLAGS) -DGLEW_NO_GLU -DGLEW_BUILD -O1 -fPIC
# Options for compiling the object files for the shared library.
# gc has to be configured with the option --disable-threads in order to make a
@@ -125,6 +126,10 @@ asy: version glew.o
version: $(GCLIB) $(FILES:=.o) $(notdir $(UIFILES:.ui=.py)) GUI/icons_rc.py
if test ! -s revision.cc -o "$(revision)" != "$(last)"; then \
echo $(REVISION)\"$(revision)\"\; > revision.cc; \
+ echo const char *AsyGLVersion=\"$(ASYGLVERSION)\"\; >> revision.cc; \
+ if test ! -e base/webgl/asygl.js; then \
+ cp base/webgl/asygl-$(ASYGLVERSION).js base/webgl/asygl.js; \
+ fi \
fi
$(CXX) $(OPTS) -o revision.o -c revision.cc;
@@ -140,7 +145,7 @@ version: $(GCLIB) $(FILES:=.o) $(notdir $(UIFILES:.ui=.py)) GUI/icons_rc.py
windres -o asy.o; \
fi
-asymptote.so: $(COREFILES:=.pic.o)
+asymptote.so: $(COREFILES:=.pic.o) glew.o
$(CXX) $(OPTS) -shared -o asymptote.so revision.o $(COREFILES:=.pic.o) $(SHAREDLIBS)
all: asy sty man faq asy-keywords.el
@@ -255,7 +260,8 @@ install-asy: asy sty
asy-keywords.el $(asydir)
${INSTALL} -p -m 755 GUI/*.py $(GUIdir)
${INSTALL} -p -m 755 base/shaders/*.glsl $(shaderdir)
- ${INSTALL} -p -m 644 base/webgl/*.html base/webgl/*.js $(webgldir)
+ ${INSTALL} -p -m 644 base/webgl/WebGL*.html base/webgl/asygl.js \
+ $(webgldir)
-${INSTALL} -p -m 644 GUI/pyUIClass/*.py $(GUIdir)/pyUIClass
${INSTALL} -p -m 644 GUI/configs/*.cson $(GUIdir)/configs
${INSTALL} -p -m 644 GUI/res/icons.qrc $(GUIdir)/res