diff options
Diffstat (limited to 'graphics/asymptote/Makefile.in')
-rw-r--r-- | graphics/asymptote/Makefile.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/graphics/asymptote/Makefile.in b/graphics/asymptote/Makefile.in index 467b4ccb0b..e3bf1722c9 100644 --- a/graphics/asymptote/Makefile.in +++ b/graphics/asymptote/Makefile.in @@ -11,10 +11,11 @@ GCOPTIONS = @GCOPTIONS@ GCLIB = @GCLIB@ GCPPLIB = @GCPPLIB@ GCLIBS = $(GCPPLIB) $(GCLIB) -LFLAGS = @LDFLAGS@ -LLspCpp +LFLAGS = @LDFLAGS@ -LLspCpp -LLspCpp/third_party/uri/src LIBS = $(LFLAGS) @PTHREAD_LIBS@ @GLEW@ @LIBS@ $(GCLIBS) @LSPLIBS@ DOSLIBS = $(subst -lncurses, -ltermcap, $(LIBS)) -lwolfssl -lgdi32 -lwinmm -s -static +CMAKE ?= cmake PERL ?= perl PYTHON ?= python3 BISON ?= bison @@ -81,7 +82,7 @@ ASY = ./asy -dir base -config "" -render=0 DEFS = @DEFS@ @OPTIONS@ @PTHREAD_CFLAGS@ -DFFTWPP_SINGLE_THREAD -Wall CFLAGS = @CFLAGS@ -OPTS = $(DEFS) @CPPFLAGS@ @CXXFLAGS@ $(CFLAGS) -ILspCpp -ILspCpp/LibLsp/JsonRpc +OPTS = $(DEFS) @CPPFLAGS@ @CXXFLAGS@ $(CFLAGS) -ILspCpp/include GLEWOPTS = $(DEFS) @CPPFLAGS@ $(CFLAGS) -DGLEW_NO_GLU -DGLEW_BUILD -O1 -fPIC @@ -160,7 +161,7 @@ asymptote.so: $(COREFILES:=.pic.o) glew.o $(CXX) $(OPTS) -shared -o asymptote.so revision.o $(COREFILES:=.pic.o) $(SHAREDLIBS) liblspcpp.a: - cd LspCpp && $(MAKE) CPPFLAGS="@OPTIONS@" + cd LspCpp && $(CMAKE) -DCMAKE_CXX_FLAGS="-fPIE @OPTIONS@ -I../$(GC)/include" CMakeLists.txt && $(MAKE) all: asy sty man faq asy-keywords.el @@ -354,6 +355,7 @@ cleaner: FORCE clean distclean: FORCE cleaner cd doc && $(MAKE) distclean + cd LspCpp && rm CMakeCache.txt cleanest: FORCE maintainer-clean maintainer-clean: FORCE distclean |