diff --git a/Makefile.defs b/Makefile.defs index d0b0b421e..3dc741484 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -905,14 +905,8 @@ ZMQ_LIB_EXT=$(if $(WIN32),.dll,$(if $(DARWIN),.4.dylib,.so.4)) ZMQ_LIB=$(OUTPUT_DIR)/libs/libzmq$(ZMQ_LIB_EXT) CZMQ_BUILD_DIR=$(THIRDPARTY_DIR)/czmq/build/$(MACHINE) CZMQ_DIR=$(CURDIR)/$(CZMQ_BUILD_DIR)/czmq-prefix/src/czmq-build -FILEMQ_BUILD_DIR=$(THIRDPARTY_DIR)/filemq/build/$(MACHINE) -FILEMQ_DIR=$(CURDIR)/$(FILEMQ_BUILD_DIR)/filemq-prefix/src/filemq-build -ZYRE_BUILD_DIR=$(THIRDPARTY_DIR)/zyre/build/$(MACHINE) -ZYRE_DIR=$(CURDIR)/$(ZYRE_BUILD_DIR)/zyre-prefix/src/zyre-build -CZMQ_FMQ_ZYRE_LIB_EXT=$(if $(WIN32),.dll,$(if $(DARWIN),.1.dylib,.so.1)) -CZMQ_LIB=$(OUTPUT_DIR)/libs/libczmq$(CZMQ_FMQ_ZYRE_LIB_EXT) -FILEMQ_LIB=$(OUTPUT_DIR)/libs/libfmq$(CZMQ_FMQ_ZYRE_LIB_EXT) -ZYRE_LIB=$(OUTPUT_DIR)/libs/libzyre$(CZMQ_FMQ_ZYRE_LIB_EXT) +CZMQ_LIB_EXT=$(if $(WIN32),.dll,$(if $(DARWIN),.1.dylib,.so.1)) +CZMQ_LIB=$(OUTPUT_DIR)/libs/libczmq$(CZMQ_LIB_EXT) TAR_BUILD_DIR=$(THIRDPARTY_DIR)/tar/build/$(MACHINE) TAR_DIR=$(CURDIR)/$(TAR_BUILD_DIR)/tar-prefix/src/tar-build @@ -1011,7 +1005,7 @@ SYMVIS_FLAGS+=-fvisibility=hidden CMAKE_THIRDPARTY_LIBS := kpvcrlib,nanosvg,zstd CMAKE_THIRDPARTY_LIBS := $(CMAKE_THIRDPARTY_LIBS),luajit,lpeg,turbo -CMAKE_THIRDPARTY_LIBS := $(CMAKE_THIRDPARTY_LIBS),zyre,czmq,filemq,libzmq +CMAKE_THIRDPARTY_LIBS := $(CMAKE_THIRDPARTY_LIBS),czmq,libzmq CMAKE_THIRDPARTY_LIBS := $(CMAKE_THIRDPARTY_LIBS),libk2pdfopt,tesseract,leptonica CMAKE_THIRDPARTY_LIBS := $(CMAKE_THIRDPARTY_LIBS),lj-wpaclient CMAKE_THIRDPARTY_LIBS := $(CMAKE_THIRDPARTY_LIBS),lua-htmlparser,lua-rapidjson,lua-Spore,luasec,luasocket,libffi,glib,lodepng,minizip diff --git a/ffi-cdecl/zeromq_cdecl.c b/ffi-cdecl/zeromq_cdecl.c index 5eca09a78..f6457b19b 100644 --- a/ffi-cdecl/zeromq_cdecl.c +++ b/ffi-cdecl/zeromq_cdecl.c @@ -1,4 +1,4 @@ -// CPPFLAGS="-I/var/tmp/niluje/zyre/include -I/var/tmp/niluje/libzmq/include -I/var/tmp/niluje/czmq/include -I/var/tmp/niluje/filemq/include" +// CPPFLAGS="-I/var/tmp/niluje/libzmq/include -I/var/tmp/niluje/czmq/include" #include #include